Changeset 9d4dfdc

Timestamp:

Jun 14, 2013, 7:39:23 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

41779bf, e428a36

Parents:

f20daff

git-author:

David Benjamin <davidben@mit.edu> (06/04/13 19:51:48)

git-committer:

David Benjamin <davidben@mit.edu> (06/14/13 19:39:23)

Message:

When replacing a variable, keep the old value

This unbreaks variable behavior on module reload.

Reported-By: Robert Jacobs <rnjacobs@mit.edu>

File:

• variable.c (modified) (1 diff)

variable.c

@@ -612 +612 @@
 void owl_variable_dict_add_variable(owl_vardict * vardict,
                                     owl_variable * var) {
+  char *oldvalue = NULL;
+  owl_variable *oldvar = owl_variable_get_var(vardict, var->name);
+  /* Save the old value as a string. */
+  if (oldvar) {
+    oldvalue = owl_variable_get_tostring(oldvar);
+  }
   owl_dict_insert_element(vardict, var->name, var, (void (*)(void *))owl_variable_delete);
+  /* Restore the old value. */
+  if (oldvalue) {
+    owl_variable_set_fromstring(var, oldvalue, 0);
+    g_free(oldvalue);
+  }
 }