ardour/livetrax
13
0
Fork 0
Code

Fix deadlock at session-close, due to shared-ptr in signal connection

Browse Source 
https://pastebin.com/08UcTRsP
https://ardour.org/styleguide.html # 10
This commit is contained in:
Robin Gareus 2020-09-04 22:47:20 +02:00
parent 6e67eba5bb
commit 5361a3f5c4
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/bundle_manager.cc
View File

@ -375,13 +375,14 @@ BundleManager::add_bundle (boost::shared_ptr<Bundle> b)
(*i)[_list_model_columns.name] = u->name ();
(*i)[_list_model_columns.bundle] = u;
u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, boost::weak_ptr<UserBundle> (u)), gui_context());
}
void
BundleManager::bundle_changed (Bundle::Change c, boost::shared_ptr<UserBundle> b)
BundleManager::bundle_changed (Bundle::Change c, boost::weak_ptr<UserBundle> wb)
{
if ((c & Bundle::NameChanged) == 0) {
boost::shared_ptr<UserBundle> b = wb.lock ();
if (!b || 0 == (c & Bundle::NameChanged)) {
return;
}

2
gtk2_ardour/bundle_manager.h
View File

@ -95,7 +95,7 @@ private:
void edit_clicked ();
void delete_clicked ();
void add_bundle (boost::shared_ptr<ARDOUR::Bundle>);
void bundle_changed (ARDOUR::Bundle::Change, boost::shared_ptr<ARDOUR::UserBundle>);
void bundle_changed (ARDOUR::Bundle::Change, boost::weak_ptr<ARDOUR::UserBundle>);
void set_button_sensitivity ();
void row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn* c);