diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 15:43:29 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-04 15:43:29 -0400 |
| commit | fe1725a141334dab82ca007fb6fc983c358e35b2 (patch) | |
| tree | d0c9729480297b1a4ee6a1565f07c2cbc18adfff /src/bitcoinrpc.cpp | |
| parent | 1376cd9d7f1d7df4395d5d686450bde44e260785 (diff) | |
| parent | 658cf0b1be93e08eee400b0bd1e9d3485313475d (diff) | |
| download | bitcoin-fe1725a141334dab82ca007fb6fc983c358e35b2.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/bitcoinrpc.cpp
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 d8b9782e3e..a24667756f 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -2371,7 +2371,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\""); - ::error( + ThreadSafeMessageBox(strprintf( _("%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" @@ -2380,7 +2380,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 |