Skip to content

Commit

Permalink
fix: [crash] crash when opening pluginModule by menu action
Browse files Browse the repository at this point in the history
Log: as title
  • Loading branch information
LiHua000 authored and deepin-mozart committed Sep 4, 2024
1 parent 1e5f38a commit 2d1ce9c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/plugins/core/modules/pluginmanagermodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void PluginManagerModule::initialize(Controller *_uiController)
mHelp->appendGroup("Help.Group.Plugin");
mHelp->addSeparator("Help.Group.Plugin");

QAction *aboutPluginAction = new QAction(MWMTA_PLUGINS, this);
QAction *aboutPluginAction = new QAction(MWM_ABOUT_PLUGINS, this);
auto cmd = ActionManager::instance()->registerAction(aboutPluginAction, "Help.AboutPlugins");
mHelp->addAction(cmd, "Help.Group.Plugin");

Expand All @@ -47,23 +47,23 @@ void PluginManagerModule::initialize(Controller *_uiController)
MWMTA_PLUGINS);
uiController->addNavigationItem(actionOptionsImpl, Priority::lowest);

std::function<AbstractWidget*()> detailWidgetCreator = [this]()->AbstractWidget*{
std::function<AbstractWidget *()> detailWidgetCreator = [this]() -> AbstractWidget * {
if (!pluginsUi) {
pluginsUi = new PluginsUi();
}
}
return new AbstractWidget(pluginsUi->getPluginDetailView());
};
std::function<AbstractWidget*()> storeWidgetCreator = [this]()->AbstractWidget*{

std::function<AbstractWidget *()> storeWidgetCreator = [this]() -> AbstractWidget * {
if (!pluginsUi) {
pluginsUi = new PluginsUi();
}
}
return new AbstractWidget(pluginsUi->getStoreWidget());
};

uiController->registerWidgetCreator("pluginDetail", detailWidgetCreator);
uiController->registerWidgetCreator(MWMTA_PLUGINS, storeWidgetCreator);

uiController->bindWidgetToNavigation(MWMTA_PLUGINS, actionOptionsImpl);

QObject::connect(navigationItemAction, &QAction::triggered, this, [this]() {
Expand All @@ -73,5 +73,5 @@ void PluginManagerModule::initialize(Controller *_uiController)
if (windowService)
windowService->setDockHeaderName(MWMTA_PLUGINS, tr("Extensions"));
});
QObject::connect(aboutPluginAction, &QAction::triggered, this, [this](){uiController->switchWidgetNavigation(MWM_ABOUT_PLUGINS);});
QObject::connect(aboutPluginAction, &QAction::triggered, this, [this]() { uiController->switchWidgetNavigation(MWMTA_PLUGINS); });
}

0 comments on commit 2d1ce9c

Please sign in to comment.