diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 15:41:07 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 15:41:07 -0400 |
| commit | 658cf0b1be93e08eee400b0bd1e9d3485313475d (patch) | |
| tree | b36d3fbc1fa71d2c85486c09a1ed6a75de4f3e9f /src/bitcoinrpc.cpp | |
| parent | ef9ab3c2a0c5f2d8862e7315a01f9cfd7bee242d (diff) | |
| parent | a37092fcf427956e31d76aac6bd52e3e3459155f (diff) | |
| download | bitcoin-658cf0b1be93e08eee400b0bd1e9d3485313475d.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
src/qt/bitcoingui.h
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 102fa14496..f10de69c8e 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -2174,7 +2174,7 @@ void ThreadRPCServer2(void* parg) strWhatAmI = strprintf(_("To use the %s option"), "\"-server\""); else if (mapArgs.count("-daemon")) strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\""); - PrintConsole( + ThreadSafeMessageBox(strprintf( _("Error: %s, you must set a rpcpassword in the configuration file:\n %s\n" "It is recommended you use the following random password:\n" "rpcuser=bitcoinrpc\n" @@ -2183,7 +2183,8 @@ void ThreadRPCServer2(void* parg) "If the file does not exist, create it with owner-readable-only file permissions.\n"), strWhatAmI.c_str(), GetConfigFile().c_str(), - EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()); + EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()), + _("Error"), wxOK | wxMODAL); #ifndef QT_GUI CreateThread(Shutdown, NULL); #endif |