Browse Source

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.
master
Adam Gibson 8 years ago
parent
commit
da44078476
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 2
      docs/JOINMARKET-QT-GUIDE.md
  2. 4
      scripts/joinmarket-qt.py

2
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: 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 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): yet created one, do Wallet->Generate (otherwise, do Wallet-->Load):

4
scripts/joinmarket-qt.py

@ -40,6 +40,8 @@ else:
import jmbitcoin as btc import jmbitcoin as btc
app = QApplication(sys.argv) app = QApplication(sys.argv)
if 'twisted.internet.reactor' in sys.modules:
del sys.modules['twisted.internet.reactor']
from qtreactor import pyqt4reactor from qtreactor import pyqt4reactor
pyqt4reactor.install() pyqt4reactor.install()
#General Joinmarket donation address; TODO #General Joinmarket donation address; TODO
@ -655,7 +657,7 @@ class SpendTab(QWidget):
daemon = jm_single().config.getint("DAEMON", "no_daemon") daemon = jm_single().config.getint("DAEMON", "no_daemon")
daemon = True if daemon == 1 else False daemon = True if daemon == 1 else False
start_reactor("localhost", start_reactor("localhost",
jm_single().config.getint("GUI", "daemon_port"), jm_single().config.getint("DAEMON", "daemon_port"),
self.clientfactory, self.clientfactory,
ish=False, ish=False,
daemon=daemon, daemon=daemon,

Loading…
Cancel
Save