zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #633 from laanwj/qtrpcconflict 

RPC: do not launch Shutdown in a new thread in case we are running the UI
This commit is contained in:
Gavin Andresen 2011-11-14 06:56:57 -08:00
parent 405ce5a876 19197d5e29
commit 88a1b89452
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bitcoinrpc.cpp
View File

@ -160,10 +160,13 @@ Value stop(const Array& params, bool fHelp)
throw runtime_error( throw runtime_error(
"stop\n" "stop\n"
"Stop bitcoin server."); "Stop bitcoin server.");
#ifndef QT_GUI
// Shutdown will take long enough that the response should get back // Shutdown will take long enough that the response should get back
CreateThread(Shutdown, NULL); CreateThread(Shutdown, NULL);
return "bitcoin server stopping"; return "bitcoin server stopping";
#else
throw runtime_error("NYI: cannot shut down GUI with RPC command");
#endif
} }
@ -2175,11 +2178,13 @@ void ThreadRPCServer2(void* parg)
else if (mapArgs.count("-daemon")) else if (mapArgs.count("-daemon"))
strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\""); strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
PrintConsole( PrintConsole(
_("Warning: %s, you must set rpcpassword=<password>\nin the configuration file: %s\n" _("Error: %s, you must set rpcpassword=<password>\nin the configuration file: %s\n"
"If the file does not exist, create it with owner-readable-only file permissions.\n"), "If the file does not exist, create it with owner-readable-only file permissions.\n"),
strWhatAmI.c_str(), strWhatAmI.c_str(),
GetConfigFile().c_str()); GetConfigFile().c_str());
#ifndef QT_GUI
CreateThread(Shutdown, NULL); CreateThread(Shutdown, NULL);
#endif
return; return;
} }