diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-06-20 19:31:06 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2013-06-21 09:26:04 +0200 |
| commit | 71cdce9c72eed9235e33d8cf7f58f7c0de80004f (patch) | |
| tree | c95aaadd7d97ff8838298f92a3d704939d8acb39 | |
| parent | 767cfb7035d9f43015afe736a0bf75d2d925c50b (diff) | |
cheese: Leave shoot button disabled when the effects selector is showinggnome-3-8
Before this patch the shoot button would get re-enabled when changing
resolution (or device) at the effects selector.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | src/cheese-window.vala | 13 |
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) |