From da44078476fb828c020eda19f78b50e6076c0a8c Mon Sep 17 00:00:00 2001 From: Adam Gibson Date: Tue, 22 Aug 2017 16:20:52 +0300 Subject: [PATCH] Small bugfixes: Ensure reactor not already installed (from pyinstaller created binaries, reactor is already installed on startup before pyqt4reactor is imported, causing failure to start. Does not affect non-binary Qt script run). Qt reads daemon config flag from DAEMON section not GUI. Typo in JMQT walkthrough guide. --- docs/JOINMARKET-QT-GUIDE.md | 2 +- scripts/joinmarket-qt.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/JOINMARKET-QT-GUIDE.md b/docs/JOINMARKET-QT-GUIDE.md index aeca753..920f2db 100644 --- a/docs/JOINMARKET-QT-GUIDE.md +++ b/docs/JOINMARKET-QT-GUIDE.md @@ -48,7 +48,7 @@ has been created in the directory you're running in. Open it and edit: Once the rpc connection is correct, you will be presented with this start screen: -![](images/JMQinitregtest.png) +![](images/JMQInitregtest.png) Note "CURRENT WALLET: NONE" means no joinmarket wallet is loaded yet. Assuming you haven't yet created one, do Wallet->Generate (otherwise, do Wallet-->Load): diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index dac2ba4..93d6551 100644 --- a/scripts/joinmarket-qt.py +++ b/scripts/joinmarket-qt.py @@ -40,6 +40,8 @@ else: import jmbitcoin as btc app = QApplication(sys.argv) +if 'twisted.internet.reactor' in sys.modules: + del sys.modules['twisted.internet.reactor'] from qtreactor import pyqt4reactor pyqt4reactor.install() #General Joinmarket donation address; TODO @@ -655,7 +657,7 @@ class SpendTab(QWidget): daemon = jm_single().config.getint("DAEMON", "no_daemon") daemon = True if daemon == 1 else False start_reactor("localhost", - jm_single().config.getint("GUI", "daemon_port"), + jm_single().config.getint("DAEMON", "daemon_port"), self.clientfactory, ish=False, daemon=daemon,