From 8726c7908744bdcc9f2006ca51f363f8a321c986 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 12 May 2010 04:43:16 +0000 Subject: [PATCH] - client: clear config before rereading config file. This means that, e.g. if you remove it will revert to the actual number. However, it also means that any config params set via command line will be overridden. svn path=/trunk/boinc/; revision=21472 --- checkin_notes | 10 ++++++++++ client/log_flags.cpp | 1 + 2 files changed, 11 insertions(+) diff --git a/checkin_notes b/checkin_notes index a70e721824..70ecfc43f2 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3522,3 +3522,13 @@ David 11 May 2010 client_state.cpp,h pers_file_xfer.cpp cpu_sched.cpp + +David 11 May 2010 + - client: clear config before rereading config file. + This means that, e.g. if you remove + it will revert to the actual number. + However, it also means that any config params + set via command line will be overridden. + + client/ + log_flags.cpp diff --git a/client/log_flags.cpp b/client/log_flags.cpp index 9933f83847..35860800a5 100644 --- a/client/log_flags.cpp +++ b/client/log_flags.cpp @@ -445,6 +445,7 @@ int read_config_file(bool init) { if (!init) { msg_printf(NULL, MSG_INFO, "Re-reading cc_config.xml"); + config.clear(); } f = boinc_fopen(CONFIG_FILE, "r"); if (!f) return ERR_FOPEN;