sync before removing all the enter events. this way it actually catches them

[chaz/openbox] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 030f38bd0706feba6dfd242aa8eeaf12f02b57d5..7b758d30e281409a62a31bcc4353cad152d66d2b 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -175,7 +175,7 @@ void menu_frame_move_on_screen(ObMenuFrame *self)
         if (RECT_INTERSECTS_RECT(*a, self->area))
             break;
     }
-    if (a) a = screen_physical_area_monitor(0);
+    if (!a) a = screen_physical_area_monitor(0);
 
     dx = MIN(0, (a->x + a->width) - (self->area.x + self->area.width));
     dy = MIN(0, (a->y + a->height) - (self->area.y + self->area.height));
@@ -564,7 +564,7 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
 
     if (menu_frame_visible == NULL) {
         /* no menus shown yet */
-        grab_pointer(TRUE, None);
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         grab_keyboard(TRUE);
     }
 
@@ -605,7 +605,7 @@ void menu_frame_hide(ObMenuFrame *self)
 
     if (menu_frame_visible == NULL) {
         /* last menu shown */
-        grab_pointer(FALSE, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
         grab_keyboard(FALSE);
     }