SoloSelection: gui part.

1 files changed, 13 insertions, 0 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 930b17a708..1a90513f72 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -272,6 +272,7 @@ Editor::set_mouse_mode (MouseMode m, bool force)
 
 	if (ARDOUR::Profile->get_mixbus()) {
 		if ( m == MouseCut) m = MouseObject;
+		if ( m == MouseAudition) m = MouseRange;
 	}
 
 	Glib::RefPtr<Action>       act  = get_mouse_mode_action(m);
@@ -289,6 +290,7 @@ Editor::mouse_mode_toggled (MouseMode m)
 {
 	if (ARDOUR::Profile->get_mixbus()) {
 		if ( m == MouseCut)  m = MouseObject;
+		if ( m == MouseAudition)  m = MouseRange;
 	}
 
 	Glib::RefPtr<Action>       act  = get_mouse_mode_action(m);
@@ -2557,6 +2559,17 @@ Editor::escape ()
 		_drags->abort ();
 	} else {
 		selection->clear ();
+		
+		//if session is playing a range, cancel that
+		if (_session->get_play_range()) {
+			_session->request_cancel_play_range();
+		}
+
+		if ( _session->solo_selection_active() ) {
+			StripableList sl;
+			_session->solo_selection( sl, false );
+		}
+		
 	}
 
 	ARDOUR_UI::instance()->reset_focus (&contents());