From: Dana Jansens <danakj@orodu.net>
Date: Tue, 27 May 2003 03:39:00 +0000 (+0000)
Subject: dont try use an icon when where isnt one
X-Git-Tag: gl2~87
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b6f6355f49e764a64bef05dadee0405e9032719e;p=dana%2Fopenbox.git

dont try use an icon when where isnt one
---

diff --git a/openbox/popup.c b/openbox/popup.c
index 07331e5e..22b1c230 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -173,8 +173,11 @@ void popup_show(Popup *self, char *text, Icon *icon)
                      textw, texth);
 
     if (self->hasicon) {
-        RrTextureSetRGBA(self->s_icon, 0, icon->data, 0, 0, icon->width,
-                         icon->height);
+        if (icon)
+            RrTextureSetRGBA(self->s_icon, 0, icon->data, 0, 0, icon->width,
+                             icon->height);
+        else
+            RrTextureSetNone(self->s_icon, 0);
         if (iconw < 1) iconw = 1; /* sanity check for crashes */
         RrSurfaceSetArea(self->s_icon,
                          theme_bwidth + theme_bevel,