Error-log button: reset on LED click & button click

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index ef8745fc55b31999066c3940dea3d54715028de0..00e7cbc8199772351128b5f1575b4c0710f60b26 100644 (file)
--- 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