summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-28 06:34:31 +0000
committerDana Jansens <danakj@orodu.net>2003-09-28 06:34:31 +0000
commitdee3d68c2245113cccbdcd8d3bdb005f73f766c5 (patch)
tree62e6d51a0f83d9a8497144a34a7c9f6adda27381 /openbox
parentf6ba1f27b9790f56bda1e5831069e2dd7e2c96a2 (diff)
try grab an icon even when there are none
Diffstat (limited to 'openbox')
-rw-r--r--openbox/framerender.c10
1 files changed, 6 insertions, 4 deletions
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;