testing whether i caused a bug with this code

[chaz/openbox] / src / Rootmenu.cc

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index 3fbc844c6fb0e67b71e9b9535fe01e7fcbe589b1..3395b4f728da28745eed496f85995e91193608cb 100644 (file)
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -58,9 +58,14 @@ void Rootmenu::itemSelected(int button, unsigned int index) {
 
   BasemenuItem *item = find(index);
 
-  if (!item->function())
+  if (! item->function())
     return;
 
+  if (! (getScreen()->getRootmenu()->isTorn() || isTorn()) &&
+      item->function() != BScreen::Reconfigure &&
+      item->function() != BScreen::SetStyle)
+    hide();
+
   switch (item->function()) {
   case BScreen::Execute:
     if (item->exec())
@@ -88,9 +93,4 @@ void Rootmenu::itemSelected(int button, unsigned int index) {
     getScreen()->getBlackbox()->reconfigure();
     return;
   }
-
-  if (! (getScreen()->getRootmenu()->isTorn() || isTorn()) &&
-      item->function() != BScreen::Reconfigure &&
-      item->function() != BScreen::SetStyle)
-    hide();
 }