diff options
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 15609706b2..b972c20589 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -272,12 +272,15 @@ void Region::set_playlist (boost::weak_ptr<Playlist> wpl) { boost::shared_ptr<Playlist> old_playlist = (_playlist.lock()); + boost::shared_ptr<Playlist> pl (wpl.lock()); if (old_playlist == pl) { return; } + _playlist = pl; + if (pl) { if (old_playlist) { for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { @@ -292,7 +295,7 @@ Region::set_playlist (boost::weak_ptr<Playlist> wpl) } else { if (old_playlist) { for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { - (*i)->remove_playlist (_playlist); + (*i)->remove_playlist (old_playlist); } } } |