Mercurial > hg > xemacs-beta

diff src/scrollbar-gtk.c @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 20773f9b7bc0
children 16112448d484
line wrap: on
line diff
--- a/src/scrollbar-gtk.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/scrollbar-gtk.c	Sat Dec 26 21:18:49 2009 -0600
@@ -56,14 +56,16 @@
 static void
 gtk_free_scrollbar_instance (struct scrollbar_instance *instance)
 {
-  if (SCROLLBAR_GTK_WIDGET (instance))
+  if (instance->scrollbar_data)
     {
-      gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance));
-      gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance));
+      if (SCROLLBAR_GTK_WIDGET (instance))
+	{
+	  gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance));
+	  gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance));
+	}
+
+      xfree (instance->scrollbar_data, void *);
     }
-
-  if (instance->scrollbar_data)
-    xfree (instance->scrollbar_data, void *);
 }
 
 /* A device method. */