[empathy] CallWindow: check the video exists before showing it



commit 5a591d49c2ce331c79247fa868a856fa2494196d
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Fri Jul 22 11:40:51 2011 +0100

    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.

 src/empathy-call-window.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 59e8338..69ceb17 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;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]