aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-10-15 18:14:05 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-10-15 18:14:05 +0000
commitc87919696d529888420effe534fd6e2ed25e6d6b (patch)
treed52fcc26400965a519ac61e38bb0c1d672b45876
parent38297ba90a6447e524514b17d3ebf0b35ea6f7f2 (diff)
parent8365992f90910df595c1e2d4dabdba1d7b97709e (diff)
downloadbitcoin-c87919696d529888420effe534fd6e2ed25e6d6b.tar.xz
Merge branch '0.5.x' into 0.6.0.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 6510377fdf..a79d028244 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -2450,7 +2450,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;