aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-07-22 18:40:51 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-07-25 19:47:24 +0800
commit5a591d49c2ce331c79247fa868a856fa2494196d (patch)
tree0cea0cfb46c449ceb4b47f7040a6ac8654fee893 /src
parent2a84ffe088258126169ae7d91806d32cab199286 (diff)
downloadgsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.tar
gsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.tar.gz
gsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.tar.bz2
gsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.tar.lz
gsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.tar.xz
gsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.tar.zst
gsoc2013-empathy-5a591d49c2ce331c79247fa868a856fa2494196d.zip
CallWindow: check the video exists before showing it
Since empathy_call_window_show_video_output_cb() is called in an idle thread, it's possible that the video is removed before the function is executed, so check if it's still there before showing it.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 59e833881..69ceb17cc 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2376,8 +2376,11 @@ emapthy_call_window_show_video_output_cb (gpointer user_data)
{
EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
- gtk_widget_hide (self->priv->remote_user_avatar_widget);
- clutter_actor_show (self->priv->video_output);
+ if (self->priv->video_output != NULL)
+ {
+ gtk_widget_hide (self->priv->remote_user_avatar_widget);
+ clutter_actor_show (self->priv->video_output);
+ }
return FALSE;
}