smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-02 03:47:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix some more dangling references to RouteGroups

Browse source 
* do not bind a shared_ptr for Edit Group.
* copy by capture, fixes radio group to not retain a reference
This commit is contained in:
Robin Gareus 2025-12-17 21:12:17 +01:00
parent 635916bf7a
commit fbc4bc4437
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/route_group_menu.cc
View file

@ -85,7 +85,8 @@ RouteGroupMenu::build (WeakRouteList const & s)
items.push_back (MenuElem (_("New Group..."), sigc::mem_fun (*this, &RouteGroupMenu::new_group)));
if (groups.size() == 1 && *groups.begin() != 0) {
items.push_back (MenuElem (_("Edit Group..."), sigc::bind (sigc::mem_fun (*this, &RouteGroupMenu::edit_group), *groups.begin ())));
std::weak_ptr<RouteGroup> wg (*groups.begin ());
items.push_back (MenuElem (_("Edit Group..."), sigc::bind (sigc::mem_fun (*this, &RouteGroupMenu::edit_group), wg)));
}
items.push_back (SeparatorElem ());
@ -122,7 +123,7 @@ RouteGroupMenu::add_item (std::shared_ptr<RouteGroup> rg, std::set<std::shared_p
RadioMenuItem* i = static_cast<RadioMenuItem*> (&items.back ());
std::weak_ptr<RouteGroup> wg (rg);
i->signal_activate().connect ([wg, i, this]() { std::shared_ptr<RouteGroup> g (wg.lock()); if (g) { set_group (i, g); }});
i->signal_activate().connect ([=]() { if (!i->get_active()) { return; } std::shared_ptr<RouteGroup> g (wg.lock()); if (g) { set_group (i, g); }});
if (groups.size() == 1 && *groups.begin() == rg) {
/* there's only one active group, and it's this one */
@ -189,8 +190,12 @@ RouteGroupMenu::new_group_dialog_finished (int r, RouteGroupDialog* d)
}
void
RouteGroupMenu::edit_group (std::shared_ptr<ARDOUR::RouteGroup> g)
RouteGroupMenu::edit_group (std::weak_ptr<ARDOUR::RouteGroup> wg)
{
std::shared_ptr<RouteGroup> g (wg.lock());
if (!g) {
return;
}
RouteGroupDialog* d = new RouteGroupDialog (g, false);
d->signal_response().connect (sigc::hide (sigc::bind (sigc::ptr_fun (&delete_when_idle<RouteGroupDialog>), d)));
d->present ();

2
gtk2_ardour/route_group_menu.h
View file

@ -40,7 +40,7 @@ public:
private:
void add_item (std::shared_ptr<ARDOUR::RouteGroup>, std::set<std::shared_ptr<ARDOUR::RouteGroup>> const &, Gtk::RadioMenuItem::Group*);
void new_group ();
void edit_group (std::shared_ptr<ARDOUR::RouteGroup>);
void edit_group (std::weak_ptr<ARDOUR::RouteGroup>);
void set_group (Gtk::RadioMenuItem*, std::shared_ptr<ARDOUR::RouteGroup>);
void new_group_dialog_finished (int, RouteGroupDialog*);