Auto merge of #1374 - str4d:1106-alert-safe-mode, r=str4d

Enable high-priority alerts to put the RPC into safe mode

This reverts the changes in 986b5e257e and adds a priority check.

Continuation of #1337
Closes #1106
This commit is contained in:
zkbot
2016-10-03 17:36:59 -04:00
7 changed files with 59 additions and 7 deletions

View File

@@ -4071,6 +4071,9 @@ string GetWarnings(string strFor)
{
nPriority = alert.nPriority;
strStatusBar = alert.strStatusBar;
if (alert.nPriority >= ALERT_PRIORITY_SAFE_MODE) {
strRPC = alert.strRPCError;
}
}
}
}