From 6048d2cd2319976c039843e3981013e42350dc3a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 11 Sep 2015 13:21:16 +0200
Subject: [PATCH] Have GUI Option reflect current state (in case toggle fails)

---
 gtk2_ardour/option_editor.cc         | 4 +++-
 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