summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Riddell <jr@jriddell.org>2016-09-30 15:55:49 (GMT)
committerJonathan Riddell <jr@jriddell.org>2016-09-30 15:55:49 (GMT)
commitc694918da8ec414ece761c9e26fe8daa9e3c1ae6 (patch)
tree651a2622ce2d12790a4f24cd36a1f9a998fa639d
parent71f0f010d5f77573531418b5955bb994782b6b64 (diff)
delete pluginWatcher sooner
-rw-r--r--app/kipiinterface.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/kipiinterface.cpp b/app/kipiinterface.cpp
index e080095..c16a778 100644
--- a/app/kipiinterface.cpp
+++ b/app/kipiinterface.cpp
@@ -335,9 +335,7 @@ void KIPIInterface::loadOnePlugin()
}
}
- if (d->mPluginWatcher) {
- delete d->mPluginWatcher;
- }
+
d->mPluginMenu->removeAction(d->mLoadingAction);
if (d->mPluginMenu->isEmpty()) {
d->mPluginMenu->addAction(d->mNoPluginAction);
@@ -364,8 +362,11 @@ void KIPIInterface::slotInstallPlugins(bool checked) {
void KIPIInterface::packageFinished() {
if (d->mPluginLoader) {
delete d->mPluginLoader;
+ d->mPluginLoader = 0;
+ }
+ if (d->mPluginWatcher) {
+ delete d->mPluginWatcher;
}
- d->mPluginLoader = 0;
d->mPluginMenu->removeAction(d->mInstallPluginAction);
d->mPluginMenu->removeAction(d->mNoPluginAction);
QTimer::singleShot(5000, this, SLOT(loadPlugins()));