From a582b48bd0610d99dd9bb036db349d79a440cb3a Mon Sep 17 00:00:00 2001 From: borysiasty Date: Tue, 29 Jun 2010 20:21:18 +0000 Subject: [PATCH] Plugin Installer minor fix git-svn-id: http://svn.osgeo.org/qgis/trunk@13845 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/plugins/plugin_installer/installer_gui.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/python/plugins/plugin_installer/installer_gui.py b/python/plugins/plugin_installer/installer_gui.py index 361197a41b1..d628b5e8207 100755 --- a/python/plugins/plugin_installer/installer_gui.py +++ b/python/plugins/plugin_installer/installer_gui.py @@ -689,12 +689,15 @@ class QgsPluginInstallerDialog(QDialog, Ui_QgsPluginInstallerDialogBase): else: # if the uninstalled plugin is the installer itself, reload it and quit if key == "plugin_installer": - try: - QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation.")) - reloadPlugin(key) - return - except: - pass + if QGIS_15: + try: + QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation.")) + reloadPlugin(key) + return + except: + pass + else: + QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version.")) # safe remove try: unloadPlugin(plugin["localdir"])