From 5a591d49c2ce331c79247fa868a856fa2494196d Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Fri, 22 Jul 2011 11:40:51 +0100 Subject: 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 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/empathy-call-window.c') 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; } -- cgit v1.2.3