Changeset e428a36 for variable.c

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Parents:

80c0fc7 (diff), 9d4dfdc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 9d4dfdcd2d49dbcc22eb7c50544376042b61a6ba into 80c0fc7442dbbcdb248b6b588246470d35b6f8ec

File:

• variable.c (modified) (2 diffs)

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);
+  }
 }
 
@@ -777 +788 @@
   g_free(v->default_str);
   g_free(v->validsettings);
-  g_value_unset(&(v->val));
+  if (v->type != OWL_VARIABLE_OTHER)
+    g_value_unset(&(v->val));
   g_closure_unref(v->get_tostring_fn);
   g_closure_unref(v->set_fromstring_fn);