Changeset f1fc47f for global.c

Timestamp:

Jun 4, 2007, 12:46:55 AM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f1589b5

Parents:

42947f1

git-author:

Nelson Elhage <nelhage@mit.edu> (06/04/07 00:46:36)

git-committer:

Nelson Elhage <nelhage@mit.edu> (06/04/07 00:46:55)

Message:

Don't corrupt the current style pointer if we redefine the current
style.

File:

• global.c (modified) (1 diff)

global.c

@@ -817 +817 @@
 void owl_global_add_style(owl_global *g, owl_style *s)
 {
-  owl_dict_insert_element(&(g->styledict), owl_style_get_name(s), 
-                          s, (void(*)(void*))owl_style_free);
+  /*
+   * If we're redefining the current style, make sure to update
+   * pointers to it.
+   */
+  if(g->current_view.style
+     && !strcmp(owl_style_get_name(g->current_view.style),
+                owl_style_get_name(s)))
+    g->current_view.style = s;
+  owl_dict_insert_element(&(g->styledict), owl_style_get_name(s),
+                          s, (void(*)(void*))owl_style_free);
 }