aboutsummaryrefslogtreecommitdiff
path: root/ui.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-08-25 00:05:37 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-08-25 00:05:37 +0000
commit401926283a200994ecd7df8eae8ced8e0b067c46 (patch)
tree4b3e85c5afc7886f1d1461bee0d075db4daaec6f /ui.cpp
parent2201a0808ea240617a66823f98dda3433d2546b0 (diff)
alert system
-- version 0.3.11 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@142 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'ui.cpp')
-rw-r--r--ui.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/ui.cpp b/ui.cpp
index b8f50b4511..d7a0eb0322 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -196,7 +196,7 @@ bool ThreadSafeAskFee(int64 nFeeRequired, const string& strCaption, wxWindow* pa
void CalledSetStatusBar(const string& strText, int nField)
{
- if (nField == 0 && IsLockdown())
+ if (nField == 0 && GetWarnings("statusbar") != "")
return;
if (pframeMain && pframeMain->m_statusBar)
pframeMain->m_statusBar->SetStatusText(strText, nField);
@@ -1013,12 +1013,13 @@ void CMainFrame::OnPaintListCtrl(wxPaintEvent& event)
RefreshStatusColumn();
// Update status bar
- static bool fPrevLockdown;
- if (IsLockdown())
- m_statusBar->SetStatusText(string(" ") + _("WARNING: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade."), 0);
- else if (fPrevLockdown)
+ static string strPrevWarning;
+ string strWarning = GetWarnings("statusbar");
+ if (strWarning != "")
+ m_statusBar->SetStatusText(string(" ") + _(strWarning), 0);
+ else if (strPrevWarning != "")
m_statusBar->SetStatusText("", 0);
- fPrevLockdown = IsLockdown();
+ strPrevWarning = strWarning;
string strGen = "";
if (fGenerateBitcoins)