tFix window closing - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fcc452d7b02759f6eb90f8e90aff5026b8ef04f2
DIR parent 8ce2a95695315f8d3cd39b8009612bc1db2d10a2
HTML Author: Neil Booth <kyuupichan@gmail.com>
Date: Fri, 4 Sep 2015 10:10:44 +0900
Fix window closing
Only closing via the menu did it properly. Closing a window via
tthe window manager didn't shut the window down at all, because
tthe code wasn't in the closeEvent handler.
Diffstat:
M gui/qt/main_window.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -461,14 +461,6 @@ class ElectrumWindow(QMainWindow):
self.config.set_key('io_dir', os.path.dirname(fileName), True)
return fileName
- def close(self):
- if self.qr_window:
- self.qr_window.close()
- QMainWindow.close(self)
- self.close_wallet()
- run_hook('close_main_window')
- self.gui_object.close_window(self)
-
def connect_slots(self, sender):
self.connect(sender, QtCore.SIGNAL('timersignal'), self.timer_actions)
t@@ -2806,6 +2798,11 @@ class ElectrumWindow(QMainWindow):
g = self.geometry()
self.config.set_key("winpos-qt", [g.left(),g.top(),g.width(),g.height()])
self.config.set_key("console-history", self.console.history[-50:], True)
+ if self.qr_window:
+ self.qr_window.close()
+ self.close_wallet()
+ run_hook('close_main_window')
+ self.gui_object.close_window(self)
event.accept()