From 18f08637ee7445b37c39b60f6b3043f43c669cc7 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 19 Oct 2012 00:46:46 -0700
Subject: [PATCH] Compile fixes

---
 clientgui/sg_TaskPanel.cpp | 21 +++++++++++++++------
 lib/gui_rpc_client_ops.cpp |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp
index ef11c6a93c..e470ee60cb 100755
--- a/clientgui/sg_TaskPanel.cpp
+++ b/clientgui/sg_TaskPanel.cpp
@@ -789,11 +789,10 @@ void CSimpleTaskPanel::GetApplicationAndProjectNames(RESULT* result, wxString* a
             strAppBuffer = wxString(state_result->avp->app_name, wxConvUTF8);
         }
         
-        if (avp->ncudas) {
-            strGPUBuffer = wxString(" (NVIDIA GPU)", wxConvUTF8);
-        }
-        if (avp->natis) {
-            strGPUBuffer = wxString(" (ATI GPU)", wxConvUTF8);
+        char buf[256];
+        if (avp->gpu_type) {
+            sprintf(buf, " (%s)", proc_type_name(avp->gpu_type));
+            strGPUBuffer = wxString(buf, wxConvUTF8);
         }
 
         appName->Printf(
@@ -937,10 +936,17 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
     CMainDocument*      pDoc = wxGetApp().GetDocument();
     CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
 
+    static bool bAlreadyRunning = false;
+
     wxASSERT(pDoc);
     wxASSERT(pSkinSimple);
     wxASSERT(wxDynamicCast(pSkinSimple, CSkinSimple));
     
+    if (bAlreadyRunning) {
+        return;
+    }
+    bAlreadyRunning = true;
+    
     count = m_TaskSelectionCtrl->GetCount();
 	// Mark all inactive (this lets us loop only once)
     for (i=0; i<count; ++i) {
@@ -1109,6 +1115,9 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
     if (needRefresh) {
         m_TaskSelectionCtrl->Refresh();
     }
+
+    bAlreadyRunning = false;
+
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleTaskPanel::UpdateTaskSelectionList - Function End"));
 }
 
@@ -1248,7 +1257,7 @@ void CSimpleTaskPanel::OnEraseBackground(wxEraseEvent& event) {
             return;
         }
     }
-        
+    
 //    CSimplePanelBase::OnEraseBackground(event);
     event.Skip();
 }
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 8fe5ec0166..dd3f428c37 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -478,7 +478,6 @@ APP_VERSION::~APP_VERSION() {
 }
 
 int APP_VERSION::parse_coproc(XML_PARSER& xp) {
-    memset(this, 0, sizeof(APP_VERSION));
     while (!xp.get_tag()) {
         if (xp.match_tag("/coproc")) {
             return 0;
@@ -490,6 +489,7 @@ int APP_VERSION::parse_coproc(XML_PARSER& xp) {
 }
 
 int APP_VERSION::parse(XML_PARSER& xp) {
+    clear();
     while (!xp.get_tag()) {
         if (xp.match_tag("/app_version")) return 0;
         if (xp.parse_str("app_name", app_name, sizeof(app_name))) continue;