X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.c;h=c6c3a4a30e476d1eabe2e553fddd560b9594c44b;hb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;hp=99043cd52caeca139a0084999e6fab6fc9977a59;hpb=dd33644de425ce545f17e9fc0f8ead05aa5bc01f;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 99043cd5..c6c3a4a3 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -392,7 +392,8 @@ void menu_entry_fire(ObMenuEntry *self, unsigned int button, unsigned int x,
 {
     ObMenu *m;
 
-    if (button > 3) return;
+    /* ignore wheel scrolling */
+    if (button == 4 || button == 5) return;
 
     if (self->action) {
         self->action->data.any.c = self->parent->client;
@@ -582,6 +583,7 @@ void menu_control_keyboard_nav(unsigned int key)
     }
     default:
         ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
+        current_menu = NULL;
     }
     return;
 }