if the current SN_WM owner is our window (can this happen?) then ignore it

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index 554f7414e12a4bdee9f6c337b25ead480c7fadc6..c672a6d275a456f2b6fe17b15a62d09384589b47 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    color.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -78,7 +78,7 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
             out->pixel = xcol.pixel;
             out->key = key;
             out->refcount = 1;
-            g_hash_table_replace(RrColorHash(inst), &out->key, out);
+            g_hash_table_insert(RrColorHash(inst), &out->key, out);
         }
     }
     return out;
@@ -88,6 +88,7 @@ void RrColorFree(RrColor *c)
 {
     if (c) {
         if (--c->refcount < 1) {
+            g_assert(g_hash_table_lookup(RrColorHash(c->inst), &c->key));
             g_hash_table_remove(RrColorHash(c->inst), &c->key);
             if (c->pixel) XFreeColors(RrDisplay(c->inst), RrColormap(c->inst),
                                       &c->pixel, 1, 0);