]> git.0d.be Git - empathy.git/commitdiff
CallWindow: check the video exists before showing it
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Fri, 22 Jul 2011 10:40:51 +0000 (11:40 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Mon, 25 Jul 2011 11:47:24 +0000 (12:47 +0100)
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.

src/empathy-call-window.c

index 59e8338817b03cdf6569136855121943c5ac2592..69ceb17cced22ed85cf83de37ba4ec55d045a60e 100644 (file)
@@ -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;
 }