extend 3cda0e2a: Don't switch to range-mode if not needed for similar OPs.

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 3b31def60fd8d1850478b019ec614cf8347756e7..770bfe9c1f220a0148e7fd60edcc6f337df21b31 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1763,7 +1763,9 @@ Editor::set_selection_from_range (Location& loc)
        selection->set (loc.start(), loc.end());
        commit_reversible_selection_op ();
 
-       set_mouse_mode (Editing::MouseRange, false);
+       if (!get_smart_mode () || mouse_mode != Editing::MouseObject) {
+               set_mouse_mode (MouseRange, false);
+       }
 }
 
 void
@@ -2022,8 +2024,11 @@ Editor::select_range_between ()
                return;
        }
 
+       if (!get_smart_mode () || mouse_mode != Editing::MouseObject) {
+               set_mouse_mode (MouseRange, false);
+       }
+
        begin_reversible_selection_op (X_("Select Range Between"));
-       set_mouse_mode (MouseRange);
        selection->set (start, end);
        commit_reversible_selection_op ();
 }