Plugin installer update: r13830 follow-up

git-svn-id: http://svn.osgeo.org/qgis/trunk@13832 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 28, 2010 · 384d299 · 384d299
1 parent afdc73d
commit 384d299
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/python/plugins/plugin_installer/installer_gui.py b/python/plugins/plugin_installer/installer_gui.py
@@ -690,6 +690,7 @@ def uninstallPlugin(self):
       # 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:

diff --git a/python/plugins/plugin_installer/installer_plugin.py b/python/plugins/plugin_installer/installer_plugin.py
@@ -31,6 +31,7 @@ def __init__(self, iface):
       self.mainWindow = self.iface.mainWindow
     else: # old plugin API
       self.mainWindow = self.iface.getMainWindow
+    self.guiDlg = None
 
 
   # ----------------------------------------- #
@@ -128,7 +129,8 @@ def unload(self):
       self.mainWindow().menuBar().actions()[4].menu().removeAction(self.action)
     if self.statusLabel:
       self.mainWindow().statusBar().removeWidget(self.statusLabel)
-    self.guiDlg.close()
+    if self.guiDlg:
+      self.guiDlg.close()
 
 
   # ----------------------------------------- #