summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cheese-window.vala13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index fc38850..a1a645c 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -1313,13 +1313,20 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
*/
public void toggle_camera_actions_sensitivities (bool active)
{
- string [] actions = { "shoot", "mode", "effects" };
+ string [] actions = { "mode", "effects" };
- /* If inactive, hide the effects selector, stop recording, etc. */
- if (!active) {
+ if (active)
+ {
+ /* Use update_shoot_enabled, so as to not adversely enable it */
+ update_shoot_enabled ();
+ }
+ else
+ {
+ /* Inactive, hide the effects selector, stop recording, etc. */
if (is_effects_selector_active)
effects_toggle_button.set_active (false);
cancel_running_action ();
+ actions += "shoot";
}
foreach (string name in actions)