fix bad fix for cherry-pick conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 5 Feb 2015 21:49:14 +0000 (16:49 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 5 Feb 2015 21:49:14 +0000 (16:49 -0500)
libs/ardour/session.cc

index 182d29ca0be127e890900714652ace4b869ffb78..67ce7e6e531c2d1597a604070f8e00e46545c04b 100644 (file)
@@ -1424,10 +1424,10 @@ Session::location_added (Location *location)
         if (location->is_skip()) {
                 /* listen for per-location signals that require us to update skip-locate events */
 
-                location->StartChanged.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, true));
-                location->EndChanged.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, true));
-                location->Changed.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, true));
-                location->FlagsChanged.connect_same_thread (skip_connections, boost::bind (&Session::update_skips, this, location, false));
+                location->StartChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true));
+                location->EndChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true));
+                location->Changed.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true));
+                location->FlagsChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, false));
 
                 update_skips (location, true);
         }