tweak display logic for monitoring state so that explicit preferences take precedence over what is reported by Track::monitor_state() (this seems as if it should be unnecessary, but ...)

git-svn-id: svn://localhost/ardour2/branches/3.0@10269 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 12 deletions

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index f152811648..9cb4941566 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -606,24 +606,24 @@ RouteUI::update_monitoring_display ()
 
 	MonitorState ms = t->monitoring_state();
 
-	if (ms & MonitoringInput) {
-		if (t->monitoring_choice() & MonitorInput) {
-			monitor_input_button->set_visual_state (1);
-		} else {
+	if (t->monitoring_choice() & MonitorInput) {
+		monitor_input_button->set_visual_state (1);
+	} else {
+		if (ms & MonitoringInput) {
 			monitor_input_button->set_visual_state (2);
+		} else {
+			monitor_input_button->set_visual_state (0);
 		}
-	} else {
-		monitor_input_button->set_visual_state (0);
 	}
 
-	if (ms & MonitoringDisk) {
-		if (t->monitoring_choice() & MonitorDisk) {
-			monitor_disk_button->set_visual_state (1);
-		} else {
+	if (t->monitoring_choice() & MonitorDisk) {
+		monitor_disk_button->set_visual_state (1);
+	} else {
+		if (ms & MonitoringDisk) {
 			monitor_disk_button->set_visual_state (2);
+		} else {
+			monitor_disk_button->set_visual_state (0);
 		}
-	} else {
-		monitor_disk_button->set_visual_state (0);
 	}
 }