From 4b7a0797762e63e1a88a9a938c384f9d48a86d5e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 8 Feb 2012 01:53:19 +0000 Subject: [PATCH] - bug fixes to previous checkin svn path=/trunk/boinc/; revision=25218 --- client/client_types.cpp | 4 ++-- clientgui/BOINCBaseView.h | 2 +- lib/gui_rpc_client_ops.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/client_types.cpp b/client/client_types.cpp index f6591ffbe9..dc2bc13e7d 100644 --- a/client/client_types.cpp +++ b/client/client_types.cpp @@ -431,8 +431,8 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) { " %s\n" " %f\n" " \n", - rsc_name(j), rsc_pwf[j].backoff_interval, - rsc_name(j), rsc_pwf[j].backoff_time + rsc_name(j), rsc_pwf[j].backoff_time, + rsc_name(j), rsc_pwf[j].backoff_interval ); if (no_rsc_ams[j]) { out.printf(" %s\n", rsc_name(j)); diff --git a/clientgui/BOINCBaseView.h b/clientgui/BOINCBaseView.h index d3b1e2e429..034b4c5d69 100644 --- a/clientgui/BOINCBaseView.h +++ b/clientgui/BOINCBaseView.h @@ -38,7 +38,7 @@ class CBOINCTaskCtrl; class CBOINCListCtrl; -class PROJECT; +struct PROJECT; class CTaskItem : wxObject { diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp index aa505c296c..4506d69577 100644 --- a/lib/gui_rpc_client_ops.cpp +++ b/lib/gui_rpc_client_ops.cpp @@ -299,6 +299,7 @@ int PROJECT::parse(XML_PARSER& xp) { } else if (!strcmp(buf, "ATI")) { rsc_desc_ati.backoff_time = value; } + break; } if (xp.parse_str("name", buf, sizeof(buf))) continue; if (xp.parse_double("value", value)) continue; @@ -316,6 +317,7 @@ int PROJECT::parse(XML_PARSER& xp) { } else if (!strcmp(buf, "ATI")) { rsc_desc_ati.backoff_interval = value; } + break; } if (xp.parse_str("name", buf, sizeof(buf))) continue; if (xp.parse_double("value", value)) continue;