1 files changed, 12 insertions, 0 deletions

diff --git a/src/WinButton.cc b/src/WinButton.cc
index 36639f5..f97784e 100644
--- a/src/WinButton.cc
+++ b/src/WinButton.cc
@@ -354,11 +354,23 @@ void WinButton::update(FbTk::Subject *subj) {
             m_icon_pixmap.release();
             m_icon_mask.release();
         } else {
+
+            // no pixmap
             if (!((hints->flags & IconPixmapHint) && hints->icon_pixmap != 0))
                 m_icon_pixmap.release();
+
+            // pixmap has changed
+            if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0 && 
+                    hints->icon_pixmap != m_icon_pixmap.drawable())
+                m_icon_pixmap.release();
             
+            // no pixmap-mask
             if (!(hints->flags & IconMaskHint))
                 m_icon_mask.release();
+
+            // pixmap-mask has changed
+            if (hints->flags & IconMaskHint && hints->icon_mask != m_icon_mask.drawable())
+                m_icon_mask.release();
         }
         
         XFree(hints);