From 8c56527a4937dd958e4bd2b8b69853ec31563157 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 7 May 2010 00:06:48 +0000
Subject: [PATCH] avoid recursion crash

---
 dtool/src/prc/configVariableCore.cxx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dtool/src/prc/configVariableCore.cxx b/dtool/src/prc/configVariableCore.cxx
index 2a105143d1..a511efd8bf 100644
--- a/dtool/src/prc/configVariableCore.cxx
+++ b/dtool/src/prc/configVariableCore.cxx
@@ -217,7 +217,14 @@ set_default_value(const string &default_value) {
   } else {
     // Modifying an existing default value.
 
-    if (_default_value->get_string_value() != default_value) {
+    // We set the original default value first, to avoid infinite
+    // recursion when the config variable in question happens to be
+    // consulted in NotifyCategory::out() (for instance,
+    // notify-timestamp).
+    string orig_default_value = _default_value->get_string_value();
+    _default_value->set_string_value(default_value);
+
+    if (orig_default_value != default_value) {
       if ((_flags & F_dconfig) != 0) {
         // As a special exception, if the flags include F_dconfig, we
         // don't report a warning for changing the default value,
@@ -227,10 +234,9 @@ set_default_value(const string &default_value) {
       } else {
         prc_cat->warning()
           << "changing default value for ConfigVariable " 
-          << get_name() << " from '" << _default_value->get_string_value()
+          << get_name() << " from '" << orig_default_value
           << "' to '" << default_value << "'.\n";
       }
-      _default_value->set_string_value(default_value);
     }
   }
 }