mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 03:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug removing submenu-groups inside menu-groups created by plugins

Browse Source 
Before this the ASSERT(group.items.empty()) in
AppMenus::removeMenuGroup() was failing when a plugin created
subgroups/submenus inside groups.

We have to remove plugins items in the reverse order that they were
added to uninstall them correctly.
This commit is contained in:
David Capello 2023-04-17 20:12:31 -03:00
parent 172e1a615b
commit 79745756ef
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/app/extensions.cpp
View File

@ -719,49 +719,52 @@ void Extension::exitScripts()
m_plugin.pluginRef = LUA_REFNIL;
}
// Remove plugin items automatically: first commands and menu
// separators, then menu groups.
for (auto& item : m_plugin.items) {
if (item.type == PluginItem::Command) {
auto cmds = Commands::instance();
auto cmd = cmds->byId(item.id.c_str());
ASSERT(cmd);
// Remove plugin items automatically from back to front (in the
// reverse order that they were added).
for (auto it=m_plugin.items.rbegin(), end=m_plugin.items.rend(); it!=end; ++it) {
auto& item = *it;
if (cmd) {
switch (item.type) {
case PluginItem::Command: {
auto cmds = Commands::instance();
auto cmd = cmds->byId(item.id.c_str());
ASSERT(cmd);
if (cmd) {
#ifdef ENABLE_UI
// TODO use a signal
AppMenus::instance()->removeMenuItemFromGroup(cmd);
// TODO use a signal
AppMenus::instance()->removeMenuItemFromGroup(cmd);
#endif // ENABLE_UI
cmds->remove(cmd);
cmds->remove(cmd);
// This will call ~PluginCommand() and unref the command
// onclick callback.
delete cmd;
// This will call ~PluginCommand() and unref the command
// onclick callback.
delete cmd;
}
break;
}
}
else if (item.type == PluginItem::MenuSeparator) {
#ifdef ENABLE_UI
ASSERT(item.widget);
ASSERT(item.widget->parent());
if (item.widget &&
item.widget->parent()) {
// TODO use a signal
AppMenus::instance()->removeMenuItemFromGroup(item.widget);
ASSERT(!item.widget->parent());
item.widget = nullptr;
}
#endif // ENABLE_UI
}
}
for (const auto& item : m_plugin.items) {
if (item.type == PluginItem::MenuGroup) {
#ifdef ENABLE_UI
// TODO use a signal
AppMenus::instance()->removeMenuGroup(item.id);
case PluginItem::MenuSeparator:
ASSERT(item.widget);
ASSERT(item.widget->parent());
if (item.widget &&
item.widget->parent()) {
// TODO use a signal
AppMenus::instance()->removeMenuItemFromGroup(item.widget);
ASSERT(!item.widget->parent());
item.widget = nullptr;
}
break;
case PluginItem::MenuGroup:
// TODO use a signal
AppMenus::instance()->removeMenuGroup(item.id);
break;
#endif // ENABLE_UI
break;
}
}