Merge #8697: fix op order to append first alert

laanwj · laanwj · commit 39ac1ec64264 · 2016-09-13T11:16:03.000+02:00
1d635ae fix op order to append first alert (rodasmith)
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -4659,12 +4659,12 @@ std::string GetWarnings(const std::string& strFor)`
`4659`	`4659`	`if (fLargeWorkForkFound)`
`4660`	`4660`	`{`
`4661`	`4661`	`strStatusBar = strRPC = "Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.";`
`4662`		`- strGUI += strGUI.empty() ? "" : uiAlertSeperator + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");`
	`4662`	`+ strGUI += (strGUI.empty() ? "" : uiAlertSeperator) + _("Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.");`
`4663`	`4663`	`}`
`4664`	`4664`	`else if (fLargeWorkInvalidChainFound)`
`4665`	`4665`	`{`
`4666`	`4666`	`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.";`
`4667`		`- 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.");`
	`4667`	`+ 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.");`
`4668`	`4668`	`}`
`4669`	`4669`
`4670`	`4670`	`if (strFor == "gui")`