Browse Source

force reactor shutdown on quit

master
Adam Gibson 8 years ago
parent
commit
1008a1262a
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 10
      scripts/joinmarket-qt.py

10
scripts/joinmarket-qt.py

@ -1126,9 +1126,10 @@ class JMWalletTab(QWidget):
class JMMainWindow(QMainWindow): class JMMainWindow(QMainWindow):
def __init__(self): def __init__(self, reactor):
super(JMMainWindow, self).__init__() super(JMMainWindow, self).__init__()
self.wallet = None self.wallet = None
self.reactor = reactor
self.initUI() self.initUI()
def closeEvent(self, event): def closeEvent(self, event):
@ -1137,6 +1138,9 @@ class JMMainWindow(QMainWindow):
if reply == QMessageBox.Yes: if reply == QMessageBox.Yes:
persist_config() persist_config()
event.accept() event.accept()
if self.reactor.threadpool is not None:
self.reactor.threadpool.stop()
self.reactor.stop()
else: else:
event.ignore() event.ignore()
@ -1576,7 +1580,8 @@ tumble_log = get_tumble_log(logsdir)
#ignored makers list persisted across entire app run #ignored makers list persisted across entire app run
ignored_makers = [] ignored_makers = []
appWindowTitle = 'JoinMarketQt' appWindowTitle = 'JoinMarketQt'
w = JMMainWindow() from twisted.internet import reactor
w = JMMainWindow(reactor)
tabWidget = QTabWidget(w) tabWidget = QTabWidget(w)
tabWidget.addTab(JMWalletTab(), "JM Wallet") tabWidget.addTab(JMWalletTab(), "JM Wallet")
settingsTab = SettingsTab() settingsTab = SettingsTab()
@ -1589,6 +1594,5 @@ w.setWindowTitle(appWindowTitle + suffix)
tabWidget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) tabWidget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
w.setCentralWidget(tabWidget) w.setCentralWidget(tabWidget)
w.show() w.show()
from twisted.internet import reactor
reactor.runReturn() reactor.runReturn()
sys.exit(app.exec_()) sys.exit(app.exec_())

Loading…
Cancel
Save