summaryrefslogtreecommitdiff
path: root/openbox/popup.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-11-21 16:56:07 -0500
committerDana Jansens <danakj@orodu.net>2009-11-21 16:56:07 -0500
commit4bf6b1b551be744be4fbe4d1faab5be12d051378 (patch)
treea17c1404021df31757bc53fe35914182f389c1e1 /openbox/popup.c
parentc02c825cb8f18f0170b312ea8d4b3f4d491bff40 (diff)
parentada5de28f71efaa5584709673cc49cdb3b703299 (diff)
Merge branch 'backport' into work
Conflicts: openbox/popup.c
Diffstat (limited to 'openbox/popup.c')
-rw-r--r--openbox/popup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/openbox/popup.c b/openbox/popup.c
index af1c511c..47d0d0fb 100644
--- 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);