diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-13 11:15:58 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-13 11:16:03 +0200 |
| commit | 39ac1ec6426447b924052c2da3f80e0220c308c3 (patch) | |
| tree | fe12e2e9e3002792558ac478c1cf87381a454e19 /src | |
| parent | 256215244105a6a3ee90d5d7216d59a7a7faefe5 (diff) | |
| parent | 1d635ae61b26d1dd613c1cc1cac796627af2a31e (diff) | |
| download | bitcoin-39ac1ec6426447b924052c2da3f80e0220c308c3.tar.xz | |
Merge #8697: fix op order to append first alert
1d635ae fix op order to append first alert (rodasmith)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index cb6e942272..593897f516 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4659,12 +4659,12 @@ std::string GetWarnings(const std::string& strFor) if (fLargeWorkForkFound) { strStatusBar = strRPC = "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."); + 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 += 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."); + 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") |