From: Dana Jansens <danakj@orodu.net>
Date: Sun, 28 Sep 2003 06:34:31 +0000 (+0000)
Subject: try grab an icon even when there are none
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=dee3d68c2245113cccbdcd8d3bdb005f73f766c5

try grab an icon even when there are none
---

diff --git a/openbox/framerender.c b/openbox/framerender.c
index a05ef6cf..a19b4ec0 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -235,12 +235,14 @@ static void framerender_label(ObFrame *self, RrAppearance *a)
 
 static void framerender_icon(ObFrame *self, RrAppearance *a)
 {
+    const ObClientIcon *icon;
+
     if (self->icon_x < 0) return;
 
-    if (self->client->nicons) {
-        const ObClientIcon *icon = client_icon(self->client,
-                                               ob_rr_theme->button_size + 2,
-                                               ob_rr_theme->button_size + 2);
+    icon = client_icon(self->client,
+                       ob_rr_theme->button_size + 2,
+                       ob_rr_theme->button_size + 2);
+    if (icon) {
         a->texture[0].type = RR_TEXTURE_RGBA;
         a->texture[0].data.rgba.width = icon->width;
         a->texture[0].data.rgba.height = icon->height;