Index: read.c =================================================================== --- read.c (revision 31150) +++ read.c (revision 31151) @@ -811,6 +811,7 @@ } +static int pxm_inited = 0; static void pxm_init(lht_node_t *pixmaps) { pxm_root = NULL; @@ -817,15 +818,19 @@ if (rdver >= 7) pxm_root = pixmaps; htip_init(&id2pxm, longhash, longkeyeq); + pxm_inited = 1; } static void pxm_uninit(void) { htip_entry_t *e; + if (!pxm_inited) + return; for(e = htip_first(&id2pxm); e != NULL; e = htip_next(&id2pxm, e)) rnd_pixmap_free(e->value); htip_uninit(&id2pxm); pxm_root = NULL; + pxm_inited = 0; }