diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-camera-menu.c | 2 | ||||
| -rw-r--r-- | src/empathy-video-src.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c index 6a7d20c15..a57253872 100644 --- a/src/empathy-camera-menu.c +++ b/src/empathy-camera-menu.c @@ -140,7 +140,9 @@ empathy_camera_menu_activate_cb (GtkAction *action, device = gtk_action_get_name (action); + empathy_call_window_play_camera (self->priv->window, FALSE); empathy_video_src_change_device (video, device); + empathy_call_window_play_camera (self->priv->window, TRUE); } static void diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c index ceb344215..25d257f3d 100644 --- a/src/empathy-video-src.c +++ b/src/empathy-video-src.c @@ -370,9 +370,9 @@ empathy_video_src_change_device (EmpathyGstVideoSrc *self, gst_element_get_state (priv->src, &state, NULL, 0); - gst_element_set_state (priv->src, GST_STATE_NULL); + g_return_if_fail (state == GST_STATE_NULL); + g_object_set (priv->src, "device", device, NULL); - gst_element_set_state (priv->src, state); } gchar * |