Merge branch '0.5.x' into 0.6.0.x

This commit is contained in:
Luke Dashjr
2012-10-15 18:14:05 +00:00

View File

@@ -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;