Merge branch 'master' of git://github.com/spesmilo/electrum

gui/qt/__init__.py

@@ -117,6 +117,9 @@ class ElectrumGui:
             path = config.get_wallet_path()
         for w in self.windows:
             if w.config.get_wallet_path() == path:
+                # Un-minimize the window and raise it
+                w.setWindowState(w.windowState() & ~QtCore.Qt.WindowMinimized | QtCore.Qt.WindowActive)
+                w.activateWindow()
                 break
         else:
             w = ElectrumWindow(config, self.network, self)