Merge remote-tracking branch 'jonny/ft'

[empathy.git] / src / empathy-call-window.c

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 6e2df7961c0c761e6f350eeb56a61a03533c4c39..7a4994c93b59a80e08b13f88eb9c12cd697cb4f0 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -4181,10 +4181,17 @@ empathy_call_window_change_webcam (EmpathyCallWindow *self,
     const gchar *device)
 {
   EmpathyGstVideoSrc *video;
+  gboolean running;
 
+  /* Restart the camera only if it's already running */
+  running = (self->priv->video_preview != NULL);
   video = empathy_call_window_get_video_src (self);
 
-  empathy_call_window_play_camera (self, FALSE);
+  if (running)
+    empathy_call_window_play_camera (self, FALSE);
+
   empathy_video_src_change_device (video, device);
-  empathy_call_window_play_camera (self, TRUE);
+
+  if (running)
+    empathy_call_window_play_camera (self, TRUE);
 }