diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-01-23 08:44:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-01-23 08:44:31 +0100 |
| commit | 8b2cf12b538fdf062b79c03f76626b541bfb66b7 (patch) | |
| tree | 7633d39d066303f966211aa2384460f1e759d4e8 /src/qt/bitcoin.cpp | |
| parent | Merge pull request #3560 (diff) | |
| parent | qt: allow `walletpassphrase` in debug console without -server (diff) | |
| download | discoin-8b2cf12b538fdf062b79c03f76626b541bfb66b7.tar.xz discoin-8b2cf12b538fdf062b79c03f76626b541bfb66b7.zip | |
Merge pull request #3553
a8db31c qt: allow `walletpassphrase` in debug console without -server (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 848e50deb..4f5edefbb 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -22,6 +22,7 @@ #include "init.h" #include "main.h" +#include "rpcserver.h" #include "ui_interface.h" #include "util.h" #include "wallet.h" @@ -226,6 +227,13 @@ void BitcoinCore::initialize() { LogPrintf("Running AppInit2 in thread\n"); int rv = AppInit2(threadGroup); + if(rv) + { + /* Start a dummy RPC thread if no RPC thread is active yet + * to handle timeouts. + */ + StartDummyRPCThread(); + } emit initializeResult(rv); } catch (std::exception& e) { handleRunawayException(&e); |