Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Compile fixes

This commit is contained in:
Charlie Fenton 2012-10-19 00:46:46 -07:00 committed by Rom Walton
parent 7da3abc76b
commit 18f08637ee
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clientgui/sg_TaskPanel.cpp
View File

@ -789,11 +789,10 @@ void CSimpleTaskPanel::GetApplicationAndProjectNames(RESULT* result, wxString* a
strAppBuffer = wxString(state_result->avp->app_name, wxConvUTF8); strAppBuffer = wxString(state_result->avp->app_name, wxConvUTF8);
} }
if (avp->ncudas) { char buf[256];
strGPUBuffer = wxString(" (NVIDIA GPU)", wxConvUTF8); if (avp->gpu_type) {
} sprintf(buf, " (%s)", proc_type_name(avp->gpu_type));
if (avp->natis) { strGPUBuffer = wxString(buf, wxConvUTF8);
strGPUBuffer = wxString(" (ATI GPU)", wxConvUTF8);
} }
appName->Printf( appName->Printf(
@ -937,10 +936,17 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
CMainDocument* pDoc = wxGetApp().GetDocument(); CMainDocument* pDoc = wxGetApp().GetDocument();
CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple(); CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
static bool bAlreadyRunning = false;
wxASSERT(pDoc); wxASSERT(pDoc);
wxASSERT(pSkinSimple); wxASSERT(pSkinSimple);
wxASSERT(wxDynamicCast(pSkinSimple, CSkinSimple)); wxASSERT(wxDynamicCast(pSkinSimple, CSkinSimple));
if (bAlreadyRunning) {
return;
}
bAlreadyRunning = true;
count = m_TaskSelectionCtrl->GetCount(); count = m_TaskSelectionCtrl->GetCount();
// Mark all inactive (this lets us loop only once) // Mark all inactive (this lets us loop only once)
for (i=0; i<count; ++i) { for (i=0; i<count; ++i) {
@ -1109,6 +1115,9 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
if (needRefresh) { if (needRefresh) {
m_TaskSelectionCtrl->Refresh(); m_TaskSelectionCtrl->Refresh();
} }
bAlreadyRunning = false;
wxLogTrace(wxT("Function Start/End"), wxT("CSimpleTaskPanel::UpdateTaskSelectionList - Function End")); wxLogTrace(wxT("Function Start/End"), wxT("CSimpleTaskPanel::UpdateTaskSelectionList - Function End"));
} }
@ -1248,7 +1257,7 @@ void CSimpleTaskPanel::OnEraseBackground(wxEraseEvent& event) {
return; return;
} }
} }
// CSimplePanelBase::OnEraseBackground(event); // CSimplePanelBase::OnEraseBackground(event);
event.Skip(); event.Skip();
} }

2
lib/gui_rpc_client_ops.cpp
View File

@ -478,7 +478,6 @@ APP_VERSION::~APP_VERSION() {
} }
int APP_VERSION::parse_coproc(XML_PARSER& xp) { int APP_VERSION::parse_coproc(XML_PARSER& xp) {
memset(this, 0, sizeof(APP_VERSION));
while (!xp.get_tag()) { while (!xp.get_tag()) {
if (xp.match_tag("/coproc")) { if (xp.match_tag("/coproc")) {
return 0; return 0;
@ -490,6 +489,7 @@ int APP_VERSION::parse_coproc(XML_PARSER& xp) {
} }
int APP_VERSION::parse(XML_PARSER& xp) { int APP_VERSION::parse(XML_PARSER& xp) {
clear();
while (!xp.get_tag()) { while (!xp.get_tag()) {
if (xp.match_tag("/app_version")) return 0; if (xp.match_tag("/app_version")) return 0;
if (xp.parse_str("app_name", app_name, sizeof(app_name))) continue; if (xp.parse_str("app_name", app_name, sizeof(app_name))) continue;