Merge branch 'backport' into work

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index af1c511cbc3d67ff9a0e207006c0c7d43ee76779..47d0d0fbca86bdda1f38ff265c5ed36fa0413229 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -64,6 +64,8 @@ ObPopup *popup_new(void)
 void popup_free(ObPopup *self)
 {
     if (self) {
+        popup_hide(self); /* make sure it's not showing or is being delayed and
+                             will be shown */
         XDestroyWindow(obt_display, self->bg);
         XDestroyWindow(obt_display, self->text);
         RrAppearanceFree(self->a_bg);