From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 11 Jan 2001 12:49:00 +0000 (+0000)
Subject: (x_free_colors, x_free_dpy_colors): Do the
X-Git-Tag: emacs-pretest-21.0.96~355
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=513c58069edda2091e4b1905554573151921e1ab;p=emacs.git

(x_free_colors, x_free_dpy_colors): Do the
unregister_colors before calling XFreeColors.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 65f912ef24d..e890dc790fd 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -701,11 +701,11 @@ x_free_colors (f, pixels, npixels)
      necessary and some servers don't allow it.  So don't do it.  */
   if (class != StaticColor && class != StaticGray && class != TrueColor)
     {
-      XFreeColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
-		   pixels, npixels, 0);
 #ifdef DEBUG_X_COLORS
       unregister_colors (pixels, npixels);
 #endif
+      XFreeColors (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
+		   pixels, npixels, 0);
     }
 }
 
@@ -729,10 +729,10 @@ x_free_dpy_colors (dpy, screen, cmap, pixels, npixels)
      necessary and some servers don't allow it.  So don't do it.  */
   if (class != StaticColor && class != StaticGray && class != TrueColor)
     {
-      XFreeColors (dpy, cmap, pixels, npixels, 0);
 #ifdef DEBUG_X_COLORS
       unregister_colors (pixels, npixels);
 #endif
+      XFreeColors (dpy, cmap, pixels, npixels, 0);
     }
 }