diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-11-27 12:34:18 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-11-27 12:34:18 -0800 |
| commit | 97c8e6389e7e5fdc0ef5f4162105a9661b325eb9 (patch) | |
| tree | 26a9051543b64ff568c8f880c2ac75753af4870a /src/bitcoinrpc.cpp | |
| parent | Merge pull request #2004 from alexanderkjeldaas/simplify-cmutexlock (diff) | |
| parent | update CClientUIInterface and remove orphan Wx stuff (diff) | |
| download | discoin-97c8e6389e7e5fdc0ef5f4162105a9661b325eb9.tar.xz discoin-97c8e6389e7e5fdc0ef5f4162105a9661b325eb9.zip | |
Merge pull request #1988 from Diapolo/ThreadSafeMessageBox
update CClientUIInterface and remove orphan Wx stuff
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 07b616438..481ceb9f4 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -769,7 +769,7 @@ void ThreadRPCServer2(void* parg) strWhatAmI.c_str(), GetConfigFile().string().c_str(), EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()), - _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL); + "", CClientUIInterface::MSG_ERROR); StartShutdown(); return; } @@ -860,7 +860,7 @@ void ThreadRPCServer2(void* parg) } if (!fListening) { - uiInterface.ThreadSafeMessageBox(strerr, _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL); + uiInterface.ThreadSafeMessageBox(strerr, "", CClientUIInterface::MSG_ERROR); StartShutdown(); return; } |