[Plugin Installer] Simplify plugin reloading

qgis · Jun 25, 2013 · fd2b221e6541c1850d7fb8b9037e13c73b9dc785 · fd2b221
1 parent 6cfe4a5
commit fd2b221e6541c1850d7fb8b9037e13c73b9dc785
Unified Split

Showing with 6 additions and 4 deletions.

+6 −4 python/pyplugin_installer/installer.py
diff --git a/python/pyplugin_installer/installer.py b/python/pyplugin_installer/installer.py
@@ -320,11 +320,13 @@ def installPlugin(self, key, quiet=False):
             settings = QSettings()
             settings.setValue("/PythonPlugins/"+plugin["id"], True)
         else:
+          infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Plugin reinstalled successfully"))
           settings = QSettings()
-          if settings.value("/PythonPlugins/"+key, False, type=bool): # plugin will be reloaded on the fly only if currently loaded
-            infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Plugin reinstalled successfully"))
-            reloadPlugin(key)
-          else: infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Python plugin reinstalled.\nYou need to restart QGIS in order to reload it."))
+          if settings.value("/PythonPlugins/"+key, False, type=bool):
+            reloadPlugin(key) # unloadPlugin + loadPlugin + startPlugin
+          else:
+            unloadPlugin(key) # Just for a case. Will exit quietly if really not loaded
+            loadPlugin(key)
         if quiet:
           infoString = (None, None)
         QApplication.restoreOverrideCursor()