tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c33b223cbec3cda1878fb34046ae10538b2269c7
DIR parent ce06d921007bc756578f3ee5b827e0bacf85f618
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 1 Sep 2015 12:16:16 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/qt/__init__.py | 3 +++
1 file changed, 3 insertions(+), 0 deletions(-)
---
DIR diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
t@@ -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)