From b1fdd64cdec8447947d5ee59daa570958998d678 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 17 Apr 2006 20:12:01 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9934
---
 clientgui/MainDocument.cpp | 16 +++++++++++-----
 clientgui/MainFrame.cpp    |  1 -
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index f4fe06d958..aa413bf02f 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -374,8 +374,9 @@ int CMainDocument::OnPoll() {
 
 
 int CMainDocument::OnRefreshState() {
-    if (IsConnected())
+    if (IsConnected()) {
         CachedStateUpdate();
+    }
 
     return 0;
 }
@@ -630,6 +631,7 @@ int CMainDocument::GetProjectCount() {
     int iCount = -1;
 
     CachedProjectStatusUpdate();
+    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!state.projects.empty())
@@ -781,6 +783,7 @@ int CMainDocument::GetWorkCount() {
 
     CachedProjectStatusUpdate();
     CachedResultsStatusUpdate();
+    CachedMessageUpdate();
     CachedStateUpdate();
 
     if (!results.results.empty())
@@ -922,8 +925,8 @@ MESSAGE* CMainDocument::message(unsigned int i) {
 int CMainDocument::GetMessageCount() {
     int iCount = -1;
 
-    CachedStateUpdate();
     CachedMessageUpdate();
+    CachedStateUpdate();
 
     if (!messages.messages.empty())
         iCount = messages.messages.size();
@@ -985,8 +988,9 @@ FILE_TRANSFER* CMainDocument::file_transfer(unsigned int i) {
 int CMainDocument::GetTransferCount() {
     int iCount = 0;
 
-    CachedStateUpdate();
     CachedFileTransfersUpdate();
+    CachedMessageUpdate();
+    CachedStateUpdate();
 
     if (!ft.file_transfers.empty())
         iCount = ft.file_transfers.size();
@@ -1068,8 +1072,9 @@ PROJECT* CMainDocument::resource(unsigned int i) {
 int CMainDocument::GetResourceCount() {
     int iCount = -1;
 
-    CachedStateUpdate();
     CachedResourceStatusUpdate();
+    CachedMessageUpdate();
+    CachedStateUpdate();
 
     if (!resource_status.projects.empty())
         iCount = resource_status.projects.size();
@@ -1126,8 +1131,9 @@ PROJECT* CMainDocument::statistic(unsigned int i) {
 int CMainDocument::GetStatisticsCount() {
     int iCount = -1;
 
-    CachedStateUpdate();
     CachedStatisticsStatusUpdate();
+    CachedMessageUpdate();
+    CachedStateUpdate();
 
     if (!statistics_status.projects.empty())
         iCount = statistics_status.projects.size();
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 3940e6e285..17215203a9 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -1934,7 +1934,6 @@ void CMainFrame::OnListPanelRender(wxTimerEvent&) {
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
 
     FireRefreshView();
-    pDoc->CachedMessageUpdate();
     SetFrameListPanelRenderTimerRate();   // Set to refresh every 5 or 60 seconds
 }