cheese r996 - in trunk: . src

[fargiolas svn gnome org]

Author: fargiolas
Date: Mon Sep  8 21:11:11 2008
New Revision: 996
URL: http://svn.gnome.org/viewvc/cheese?rev=996&view=rev

Log:
set take_picture sensitiveness before webcam_stop_video_recording since this emits a signal that would lead to another sensitiveness change. see comments on bug #547422

Modified:
   trunk/ChangeLog
   trunk/src/cheese-window.c

Modified: trunk/src/cheese-window.c
==============================================================================
--- trunk/src/cheese-window.c	(original)
+++ trunk/src/cheese-window.c	Mon Sep  8 21:11:11 2008
@@ -1215,7 +1215,6 @@
 {
   if (cheese_window->recording)
   {
-    cheese_webcam_stop_video_recording (cheese_window->webcam);
     gtk_action_group_set_sensitive (cheese_window->actions_effects, TRUE);
     gtk_action_group_set_sensitive (cheese_window->actions_toggle, TRUE);
     gtk_widget_set_sensitive (cheese_window->take_picture, FALSE);
@@ -1229,6 +1228,7 @@
     gtk_image_set_from_stock (GTK_IMAGE (cheese_window->image_take_photo_fullscreen),
                               GTK_STOCK_MEDIA_RECORD, GTK_ICON_SIZE_BUTTON);
 
+    cheese_webcam_stop_video_recording (cheese_window->webcam);
     cheese_window->recording = FALSE;
   }
 }