aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-03-09 04:18:51 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-03-09 04:18:51 +0800
commit1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05 (patch)
treef80749204de6e4ea1e44c4ff711351631f5a5162
parente43d20edae8b5bac6c1232842360918dce595573 (diff)
downloadgsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.tar
gsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.tar.gz
gsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.tar.bz2
gsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.tar.lz
gsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.tar.xz
gsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.tar.zst
gsoc2013-empathy-1a4c1a5a31e2d2b7c8dc6c6f22100dd385132e05.zip
Only check if the error came from the video_input if it's there
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2644
-rw-r--r--src/empathy-call-window.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 745fde3c6..cfa65f7d3 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1049,8 +1049,9 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
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);