From 9868031a9c242a8e4e3012c90bfe1965141283b2 Mon Sep 17 00:00:00 2001 From: James Coxon Date: Sat, 15 Apr 2017 07:34:52 +0100 Subject: [PATCH] Displays block count for all states, simplified code Due to the frequency of refreshing can appear out of sync with the block count display in Advanced (when catching up) - minor issue --- rai/qt/qt.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/rai/qt/qt.cpp b/rai/qt/qt.cpp index 2f76efa3..d9f23821 100644 --- a/rai/qt/qt.cpp +++ b/rai/qt/qt.cpp @@ -642,12 +642,7 @@ std::string rai_qt::status::text () result = "Status: Generating proof of work"; break; case rai_qt::status_types::synchronizing: - result = "Status: Synchronizing, Block: "; - if (unchecked != 0) - { - count_string += " (" + std::to_string (unchecked) + ")"; - } - result += count_string.c_str (); + result = "Status: Synchronizing"; break; case rai_qt::status_types::locked: result = "Status: Wallet locked"; @@ -659,17 +654,20 @@ std::string rai_qt::status::text () result = "Status: Wallet active"; break; case rai_qt::status_types::nominal: - result = "Status: Running, Block: "; - if (unchecked != 0) - { - count_string += " (" + std::to_string (unchecked) + ")"; - } - result += count_string.c_str (); + result = "Status: Running"; break; default: assert (false); break; } + + result += ", Block: "; + if (unchecked != 0) + { + count_string += " (" + std::to_string (unchecked) + ")"; + } + result += count_string.c_str (); + return result; }