stop sending video when 'camera off' or 'preview' is enabled

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index eda10f1314c30ab597af889411f8361c914652f0..02509a564dd85213cdb4a1e8aec3fecb57de8b6a 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -740,8 +740,8 @@ disable_camera (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
-  priv->camera_state = CAMERA_STATE_OFF;
   display_video_preview (self, FALSE);
+  empathy_call_window_set_send_video (self, FALSE);
 
   block_camera_control_signals (self);
   gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
@@ -749,6 +749,8 @@ disable_camera (EmpathyCallWindow *self)
   gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
       priv->tool_button_camera_preview), FALSE);
   unblock_camera_control_signals (self);
+
+  priv->camera_state = CAMERA_STATE_OFF;
 }
 
 static void
@@ -782,7 +784,10 @@ enable_preview (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
-  priv->camera_state = CAMERA_STATE_PREVIEW;
+  if (priv->camera_state == CAMERA_STATE_ON)
+    /* preview is already displayed so we just have to stop sending */
+    empathy_call_window_set_send_video (self, FALSE);
+
   display_video_preview (self, TRUE);
 
   block_camera_control_signals (self);
@@ -791,6 +796,8 @@ enable_preview (EmpathyCallWindow *self)
   gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
         priv->tool_button_camera_on), FALSE);
   unblock_camera_control_signals (self);
+
+  priv->camera_state = CAMERA_STATE_PREVIEW;
 }
 
 static void
@@ -824,7 +831,6 @@ enable_camera (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
-  priv->camera_state = CAMERA_STATE_ON;
   empathy_call_window_set_send_video (self, TRUE);
 
   block_camera_control_signals (self);
@@ -833,6 +839,8 @@ enable_camera (EmpathyCallWindow *self)
   gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
         priv->tool_button_camera_preview), FALSE);
   unblock_camera_control_signals (self);
+
+  priv->camera_state = CAMERA_STATE_ON;
 }
 
 static void