X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWindowmenu.cc;h=c49a6f91e3177771649654ee590afe050078814d;hb=01a6d810b6b35288410ed43819a940749d92362f;hp=089cce575cb5e5564ff5dcd7c1a67925c2bc223f;hpb=8eb930551c33ac47e7b39adf95bd4c2e3cb87b1a;p=chaz%2Fopenbox

diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc
index 089cce57..c49a6f91 100644
--- a/src/Windowmenu.cc
+++ b/src/Windowmenu.cc
@@ -92,7 +92,7 @@ void Windowmenu::show(void) {
 void Windowmenu::itemSelected(int button, unsigned int index) {
   if (button != 1)
     return;
-  
+
   BasemenuItem *item = find(index);
 
   hide();
@@ -114,13 +114,15 @@ void Windowmenu::itemSelected(int button, unsigned int index) {
     break;
 
   case BScreen::WindowRaise: {
-    Workspace *wkspc = getScreen()->getWorkspace(window->getWorkspaceNumber());
+    Workspace *wkspc =
+      getScreen()->getWorkspace(window->getWorkspaceNumber());
     wkspc->raiseWindow(window);
   }
     break;
 
   case BScreen::WindowLower: {
-    Workspace *wkspc = getScreen()->getWorkspace(window->getWorkspaceNumber());
+    Workspace *wkspc =
+      getScreen()->getWorkspace(window->getWorkspaceNumber());
     wkspc->lowerWindow(window);
   }
     break;
@@ -180,9 +182,8 @@ void Windowmenu::SendtoWorkspacemenu::itemSelected(int button,
 void Windowmenu::SendtoWorkspacemenu::update(void) {
   unsigned int i, r = getCount(),
     workspace_count = getScreen()->getWorkspaceCount();
-  if (r > workspace_count) {
-    for (i = r; i < workspace_count; ++i)
-      remove(0);
+  while (r > workspace_count) {
+    remove(0);
     r = getCount();
   }
 
@@ -192,8 +193,8 @@ void Windowmenu::SendtoWorkspacemenu::update(void) {
       ++r;
     } else {
       changeItemLabel(i, getScreen()->getWorkspace(i)->getName());
+      setItemEnabled(i, i != getScreen()->getCurrentWorkspaceID());
     }
-    setItemEnabled(i, i != getScreen()->getCurrentWorkspaceID());
   }
 
   Basemenu::update();