empathy r2644 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Sun Mar  8 20:18:51 2009
New Revision: 2644
URL: http://svn.gnome.org/viewvc/empathy?rev=2644&view=rev

Log:
Only check if the error came from the video_input if it's there

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/src/empathy-call-window.c

Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c	(original)
+++ trunk/src/empathy-call-window.c	Sun Mar  8 20:18:51 2009
@@ -1049,8 +1049,9 @@
 
           g_message ("Element error: %s -- %s\n", error->message, debug);
 
-          if (empathy_gst_bin_has_child (GST_BIN (priv->video_input),
-              GST_ELEMENT (GST_MESSAGE_SRC (message))))
+          if (priv->video_input != NULL &&
+              empathy_gst_bin_has_child (GST_BIN (priv->video_input),
+                GST_ELEMENT (GST_MESSAGE_SRC (message))))
             {
               /* Remove the video input and continue */
               empathy_call_window_remove_video_input (self);