diff --git a/src/app/main.cpp b/src/app/main.cpp index 9925a7713..fdb0f67ea 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -104,7 +104,6 @@ int main(int argc, char *argv[]) DApplication a(argc, argv); a.setOrganizationName("deepin"); - a.setQuitOnLastWindowClosed(false); CommandParser::instance().process(); // TODO(Any): put to command processor diff --git a/src/framework/lifecycle/private/pluginmanager_p.cpp b/src/framework/lifecycle/private/pluginmanager_p.cpp index b82d6b903..577d31672 100644 --- a/src/framework/lifecycle/private/pluginmanager_p.cpp +++ b/src/framework/lifecycle/private/pluginmanager_p.cpp @@ -235,6 +235,9 @@ bool PluginManagerPrivate::startPlugin(PluginMetaObjectPointer &pluginMetaObj) */ void PluginManagerPrivate::stopPlugin(PluginMetaObjectPointer &pluginMetaObj) { + if (!pluginMetaObj->d->plugin) + return; + dpfCheckTimeBegin(); //流程互斥 diff --git a/src/plugins/option/optioncore/optioncore.cpp b/src/plugins/option/optioncore/optioncore.cpp index 343414ee8..22c667f51 100644 --- a/src/plugins/option/optioncore/optioncore.cpp +++ b/src/plugins/option/optioncore/optioncore.cpp @@ -103,6 +103,5 @@ bool OptionCore::start() dpf::Plugin::ShutdownFlag OptionCore::stop() { - delete OptionDefaultKeeper::getOptionDialog(); return Sync; }