Merge pull request #3553

a8db31c qt: allow `walletpassphrase` in debug console without -server (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2014-01-23 08:44:20 +01:00
5 changed files with 30 additions and 3 deletions

View File

@@ -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);