MCP: share add-marker code with BasicUI; don't allow route locking if the strip has...

[ardour.git] / libs / surfaces / mackie / strip.cc

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 42954fae80f08a9fcf1513189d350e891b852fd9..24d3e4ac31fb5755c944d9824d5284893360238a 100644 (file)
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -474,7 +474,9 @@ Strip::handle_button (Button& button, ButtonState bs)
                        int lock_mod = (MackieControlProtocol::MODIFIER_CONTROL|MackieControlProtocol::MODIFIER_SHIFT);
 
                        if ((_surface->mcp().modifier_state() & lock_mod) == lock_mod) {
-                               _route_locked = !_route_locked;
+                               if (_route) {
+                                       _route_locked = !_route_locked;
+                               }
                        } else {
                                _surface->mcp().select_track (_route);
                        }
@@ -666,7 +668,10 @@ Strip::display (uint32_t line_number, const std::string& line)
 void
 Strip::lock_route ()
 {
-       _route_locked = true;
+       /* don't lock unless we have a route */
+       if (_route) {
+               _route_locked = true;
+       }
 }
 
 void