summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-02-05 16:49:14 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2015-02-05 16:49:14 -0500
commitc76523aeaa72672c025943f545f702ceefb56dbc (patch)
tree83bb415cddf905d5add659cbfecea5563fed7215 /libs
parente8b6f852f649340233023dd9a52733667de7b3f6 (diff)
fix bad fix for cherry-pick conflict
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/session.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 182d29ca0b..67ce7e6e53 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -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);
}