X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=c3e7ae6cee31e6a949a5b61b4482b6f0b9ca5663;hb=173f05616b7f033881a633adbda5bf3310034338;hp=aa21807cfa15b6586ce9ed1d427cd615a2432291;hpb=877247992a02dc3126dd2f6a0ecf03193fdf226b;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index aa21807c..c3e7ae6c 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -2047,18 +2047,19 @@ void client_update_icons(ObClient *self) if ((hints = XGetWMHints(ob_display, self->window))) { if (hints->flags & IconPixmapHint) { - self->nicons++; + self->nicons = 1; self->icons = g_new(ObClientIcon, self->nicons); xerror_set_ignore(TRUE); if (!RrPixmapToRGBA(ob_rr_inst, hints->icon_pixmap, (hints->flags & IconMaskHint ? hints->icon_mask : None), - &self->icons[self->nicons-1].width, - &self->icons[self->nicons-1].height, - &self->icons[self->nicons-1].data)){ - //g_free(&self->icons[self->nicons-1]); - self->nicons--; + &self->icons[0].width, + &self->icons[0].height, + &self->icons[0].data)) + { + g_free(self->icons); + self->nicons = 0; } xerror_set_ignore(FALSE); }