From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 14 Sep 2005 18:01:58 +0000 (+0000)
Subject: never code on an empty stomach
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=c7a75a5ca893b10b06deb2f42afc4995cb5cbf1c;p=chaz%2Fopenbox

never code on an empty stomach
---

diff --git a/openbox/menu.c b/openbox/menu.c
index 3db8e822..d4e44418 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -299,16 +299,16 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     menu_frame_hide_all();
 
     frame = menu_frame_new(self, client);
-    if (client && x < 0 && y < 0)
-        menu_frame_move(frame,
-                        client->frame->area.x + client->frame->size.left,
-                        client->frame->area.y + client->frame->size.top);
-    else
+    if (client && x < 0 && y < 0) {
+        x = client->frame->area.x + client->frame->size.left;
+        y = client->frame->area.y + client->frame->size.top;
+        menu_frame_move(frame, x, y);
+    } else
         menu_frame_move(frame,
                         x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
     for (i = 0; i < screen_num_monitors; ++i) {
         Rect *a = screen_physical_area_monitor(i);
-        if (RECT_CONTAINS(*a, frame->area.x, frame->area.y)) {
+        if (RECT_CONTAINS(*a, x, y)) {
             frame->monitor = i;
             break;
         }