From c8bde8cfd59064208f622ec2a2750806ef1675bf Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 5 Jun 2014 17:56:03 -0700
Subject: [PATCH] client: fix bug that caused app_config settings to persist
 incorrectly

We needed to clear the app_configs and app_version_configs vectors in PROJECT
if app_config.xml isn't there
---
 client/app_config.cpp | 1 +
 client/app_config.h   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/client/app_config.cpp b/client/app_config.cpp
index 13b2a75ca7..e65bee018c 100644
--- a/client/app_config.cpp
+++ b/client/app_config.cpp
@@ -191,6 +191,7 @@ void max_concurrent_init() {
 // It will be restored on next scheduler RPC.
 //
 static void clear_app_config(PROJECT* p) {
+    p->app_configs.clear();
     for (unsigned int i=0; i<gstate.apps.size(); i++) {
         APP* app = gstate.apps[i];
         if (app->project != p) continue;
diff --git a/client/app_config.h b/client/app_config.h
index d2e9eac063..81c6c111d2 100644
--- a/client/app_config.h
+++ b/client/app_config.h
@@ -54,6 +54,10 @@ struct APP_CONFIGS {
     int parse(XML_PARSER&, PROJECT*);
     int parse_file(FILE*, PROJECT*);
     void config_app_versions(PROJECT*, bool show_warnings);
+    void clear() {
+        app_configs.clear();
+        app_version_configs.clear();
+    }
 };
 
 extern bool have_max_concurrent;