diff options
author | Robin Gareus <robin@gareus.org> | 2015-09-11 13:21:16 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-09-11 13:21:16 +0200 |
commit | 6048d2cd2319976c039843e3981013e42350dc3a (patch) | |
tree | 019a11b32c59ce28aa22a7fe2854318ecfc34a13 | |
parent | 9fcc48d140ffcb2d22ca92952047b31337ee9b1c (diff) |
Have GUI Option reflect current state (in case toggle fails)
-rw-r--r-- | gtk2_ardour/option_editor.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/session_option_editor.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 54424b5ca3..59e10f058b 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -140,7 +140,9 @@ BoolOption::set_state_from_config () void BoolOption::toggled () { - _set (_button->get_active ()); + if (!_set (_button->get_active ())) { + _button->set_active (_get ()); + } } RouteDisplayBoolOption::RouteDisplayBoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s) diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index e07ecbdca7..df6fefcbf0 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -414,7 +414,7 @@ SessionOptionEditor::set_use_monitor_section (bool yn) Config->set_use_monitor_bus (yn); - return had_monitor_section != yn; + return had_monitor_section != (_session->monitor_out() != 0); } bool |