aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-10-15 18:14:15 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-10-15 18:14:15 +0000
commita9f8791388ffad16f208bd8ea64d55808e0362a7 (patch)
treeb6d251a12c29f31cca79e80edf9163d94e8476e5
parent5dc6be8bba5853a0588c6e46fa0c2a97b0096196 (diff)
parentc87919696d529888420effe534fd6e2ed25e6d6b (diff)
downloadbitcoin-a9f8791388ffad16f208bd8ea64d55808e0362a7.tar.xz
Merge branch '0.6.0.x' into 0.6.x
-rw-r--r--src/bitcoinrpc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index af011f4437..afd249578b 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -2425,7 +2425,7 @@ void ThreadRPCServer2(void* parg)
}
catch(boost::system::system_error &e)
{
- ThreadSafeMessageBox(strprintf(_("An error occurred while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
+ ThreadSafeMessageBox(strprintf(_("An error occurred while setting up the RPC port %u for listening: %s"), endpoint.port(), e.what()),
_("Error"), wxOK | wxMODAL);
StartShutdown();
return;