summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-03-20 22:12:40 +0100
committerRobin Gareus <robin@gareus.org>2015-03-20 22:12:40 +0100
commitd682ced80fc93eecba2a580ec63782cd5cfc8327 (patch)
tree5c63d9c886f969b6dbcda57255d5b210e0d93a01 /gtk2_ardour
parent2a9d7286f9058f3baa730078254fbe552d2296c4 (diff)
Error-log button: reset on LED click & button click
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui2.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index ef8745fc55..00e7cbc819 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -331,7 +331,7 @@ ARDOUR_UI::setup_transport ()
feedback_alert_button.set_name ("feedback alert");
feedback_alert_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::feedback_alert_press), false);
error_alert_button.set_name ("error alert");
- error_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false);
+ error_alert_button.signal_button_release_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false);
act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
error_alert_button.set_related_action(act);
error_alert_button.set_fallthrough_to_parent(true);
@@ -549,12 +549,12 @@ ARDOUR_UI::feedback_alert_press (GdkEventButton *)
bool
ARDOUR_UI::error_alert_press (GdkEventButton* ev)
{
- if (ev->button != 1) {
- return false;
+ if (ev->button == 1) {
+ _log_not_acknowledged = LogLevelNone;
+ error_blink (false); // immediate acknowledge
}
- _log_not_acknowledged = LogLevelNone;
- error_blink (false); // immediate acknowledge
- return true;
+ // fall through to to button toggle
+ return false;
}
void