Skip to content

Commit 0606f95

Browse files
committed
Merge #7579: [Qt] show network/chain errors in the GUI
2f32c82 [Qt] show network/chain errors in the GUI (Jonas Schnelli)
2 parents 9d0f43b + 2f32c82 commit 0606f95

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4633,6 +4633,7 @@ std::string GetWarnings(const std::string& strFor)
46334633
string strStatusBar;
46344634
string strRPC;
46354635
string strGUI;
4636+
const string uiAlertSeperator = "<hr />";
46364637

46374638
if (!CLIENT_VERSION_IS_RELEASE) {
46384639
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)
46454646
// Misc warnings like out of disk space and clock is wrong
46464647
if (strMiscWarning != "")
46474648
{
4648-
strStatusBar = strGUI = strMiscWarning;
4649+
strStatusBar = strMiscWarning;
4650+
strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + strMiscWarning;
46494651
}
46504652

46514653
if (fLargeWorkForkFound)
46524654
{
46534655
strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";
4654-
strGUI = _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
4656+
strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");
46554657
}
46564658
else if (fLargeWorkInvalidChainFound)
46574659
{
46584660
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.";
4659-
strGUI = _("Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.");
4661+
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.");
46604662
}
46614663

46624664
if (strFor == "gui")

0 commit comments

Comments
 (0)