From c76523aeaa72672c025943f545f702ceefb56dbc Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 5 Feb 2015 16:49:14 -0500 Subject: [PATCH] fix bad fix for cherry-pick conflict --- libs/ardour/session.cc | 8 ++++---- 1 file 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); }