From b3536b414fe45243a510d1f526cf875edadafc96 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 11 Nov 2009 00:36:07 +0000
Subject: [PATCH] - client: handle no_cpu, no_cuda, no_ati prefs correctly    
 when they're in venue-specific prefs.

svn path=/trunk/boinc/; revision=19537
---
 checkin_notes         | 7 +++++++
 client/cs_account.cpp | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/checkin_notes b/checkin_notes
index e1488f78a2..43531ae007 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9052,3 +9052,10 @@ David  10 Nov 2009
 
     client/
         app_control.cpp
+
+David  10 Nov 2009
+    - client: handle no_cpu, no_cuda, no_ati prefs correctly
+        when they're in venue-specific prefs.
+
+    client/
+        cs_account.cpp
diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index 17ee05c8c0..cb10276684 100644
--- a/client/cs_account.cpp
+++ b/client/cs_account.cpp
@@ -176,6 +176,9 @@ int PROJECT::parse_account_file_venue() {
             if (!strcmp(venue, host_venue)) {
                 using_venue_specific_prefs = true;
                 in_right_venue = true;
+                no_cpu_pref = false;    // reset these
+                no_cuda_pref = false;
+                no_ati_pref = false;
             } else {
                 std::string devnull;
                 retval = copy_element_contents(in, "</venue>", devnull);