ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Robin Gareus 2015-03-20 22:12:40 +01:00
parent 2a9d7286f9
commit d682ced80f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/ardour_ui2.cc
View File

@ -331,7 +331,7 @@ ARDOUR_UI::setup_transport ()
feedback_alert_button.set_name ("feedback alert"); 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); 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.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")); act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
error_alert_button.set_related_action(act); error_alert_button.set_related_action(act);
error_alert_button.set_fallthrough_to_parent(true); error_alert_button.set_fallthrough_to_parent(true);
@ -549,12 +549,12 @@ ARDOUR_UI::feedback_alert_press (GdkEventButton *)
bool bool
ARDOUR_UI::error_alert_press (GdkEventButton* ev) ARDOUR_UI::error_alert_press (GdkEventButton* ev)
{ {
if (ev->button != 1) { if (ev->button == 1) {
return false; _log_not_acknowledged = LogLevelNone;
error_blink (false); // immediate acknowledge
} }
_log_not_acknowledged = LogLevelNone; // fall through to to button toggle
error_blink (false); // immediate acknowledge return false;
return true;
} }
void void