X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=7b758d30e281409a62a31bcc4353cad152d66d2b;hb=4cbfe3eac0570679ae3a8e5c4df20e06d5418573;hp=030f38bd0706feba6dfd242aa8eeaf12f02b57d5;hpb=3e7b4478ee8fdfd5c255723c006ac9292582e747;p=chaz%2Fopenbox

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 030f38bd..7b758d30 100644
--- 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);
     }