Merge pull request #500

06c8b94 daemon: fix blockchain height display not updating after sync (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-11-24 23:04:01 +02:00
commit 64d7384779
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -283,7 +283,7 @@ bool t_rpc_command_executor::show_status() {
tools::success_msg_writer() << boost::format("Height: %llu/%llu (%.1f%%) on %s, net hash %s, v%u, %s, %u+%u connections")
% (unsigned long long)ires.height
% (unsigned long long)(ires.target_height ? ires.target_height : ires.height)
% (unsigned long long)(ires.target_height >= ires.height ? ires.target_height : ires.height)
% (100.0f * ires.height / (ires.target_height ? ires.target_height < ires.height ? ires.height : ires.target_height : ires.height))
% (ires.testnet ? "testnet" : "mainnet")
% [&ires]()->std::string {