From c37c1c489d8302692efe0830594a8a8bd96f35b8 Mon Sep 17 00:00:00 2001
From: Brian Boshes <boshesbr@unknown.invalid>
Date: Fri, 6 Aug 2004 21:54:40 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4016
---
 client/cs_data.C      |  3 ++-
 client/cs_scheduler.C | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/cs_data.C b/client/cs_data.C
index 435c68fb68..7d453037bb 100644
--- a/client/cs_data.C
+++ b/client/cs_data.C
@@ -131,6 +131,7 @@ bool CLIENT_STATE::fix_data_overflow(double tdu, double adu) {
                 return true;
             }
             i = 0;
+            deleted = false;
         }
         p = projects[i];
         deleted_space = delete_results(p, 1);
@@ -365,7 +366,7 @@ int CLIENT_STATE::delete_inactive_results(PROJECT *p) {
     
     for(i = 0; i < results.size(); i++) {
         result = results[i];
-        if(!result->is_active || result->state < RESULT_COMPUTE_DONE) {
+        if(!result->is_active && result->state < RESULT_COMPUTE_DONE) {
             result->got_server_ack = true;
             unstick_result_files(result);
             deleted = true;
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index ae57b574fc..955d1591e2 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -203,15 +203,12 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p, double work_req) {
 		}
 		fprintf(f, "    </app_versions>\n");
 	}
-    if (!anything_free(free)){
-        fprintf(f, "    <project_disk_free>%f</project_disk_free>\n", free);
-    }
-    if (!total_potential_offender(p, possible)) {
-        fprintf(f, "    <potentially_free_offender>%f</potentially_free_offender>\n", possible);
-    }
-    if (!total_potential_self(p, possible)) {
-        fprintf(f, "    <potentially_free_self>%f</potentially_free_self>\n", possible);
-    }
+    anything_free(free);
+    fprintf(f, "    <project_disk_free>%f</project_disk_free>\n", free);
+    total_potential_offender(p, possible);
+    fprintf(f, "    <potentially_free_offender>%f</potentially_free_offender>\n", possible);
+    total_potential_self(p, possible);
+    fprintf(f, "    <potentially_free_self>%f</potentially_free_self>\n", possible);
     if (strlen(p->code_sign_key)) {
         fprintf(f, "    <code_sign_key>\n%s</code_sign_key>\n", p->code_sign_key);
     }