diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-25 14:55:22 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-25 14:55:26 +0200 |
| commit | 0606f95b1ea85bcbb04b0703f2eb4a8ab07b5b45 (patch) | |
| tree | ba4110ec6206ad3a06ce83f072c60215bf56a721 | |
| parent | 9d0f43b7ca7241d8a018fd35dd3bc01555235ec6 (diff) | |
| parent | 2f32c82b3d128e42f15e22e00e4ef680d327365f (diff) | |
| download | bitcoin-0606f95b1ea85bcbb04b0703f2eb4a8ab07b5b45.tar.xz | |
Merge #7579: [Qt] show network/chain errors in the GUI
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 291d7e66a7..9a064b8e40 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4633,6 +4633,7 @@ std::string GetWarnings(const std::string& strFor) string strStatusBar; string strRPC; string strGUI; + const string uiAlertSeperator = "<hr />"; if (!CLIENT_VERSION_IS_RELEASE) { strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications"; @@ -4645,18 +4646,19 @@ std::string GetWarnings(const std::string& strFor) // Misc warnings like out of disk space and clock is wrong if (strMiscWarning != "") { - strStatusBar = strGUI = strMiscWarning; + strStatusBar = strMiscWarning; + strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning; } if (fLargeWorkForkFound) { strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues."; - strGUI = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues."); + strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues."); } else if (fLargeWorkInvalidChainFound) { strStatusBar = strRPC = "Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."; - strGUI = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."); + strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade."); } if (strFor == "gui") |