Merge branch 'backport' into work

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index fd31846eb8c309b65f3ef2939a54472cad794761..bddf137db29d555c930b750062cfc255a27517bf 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -319,7 +319,7 @@ void popup_hide(ObPopup *self)
 
         event_end_ignore_all_enters(ignore_start);
     } else if (self->delay_mapped) {
-        obt_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+        obt_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
         self->delay_mapped = FALSE;
     }
 }