refix i18n for --disable-nls

[chaz/openbox] / src / Window.cc

diff --git a/src/Window.cc b/src/Window.cc
index 3f531d52ded9623b08574550d452ef505fa52ab4..342864c9e11d4cbd48208e6555983e4158d3db11 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -314,9 +314,14 @@ OpenboxWindow::~OpenboxWindow(void) {
     XUngrabPointer(display, CurrentTime);
   }
 
-  if (workspace_number != -1 && window_number != -1)
-    screen->getWorkspace(workspace_number)->removeWindow(this);
-  else if (flags.iconic)
+  if (workspace_number != -1 && window_number != -1) {
+    if (flags.stuck) {
+      // make sure no other workspaces think that we're focused
+      for (int i=0; i < screen->getWorkspaceCount(); i++)
+        screen->getWorkspace(i)->removeWindow(this);
+    } else
+      screen->getWorkspace(workspace_number)->removeWindow(this);
+  } else if (flags.iconic)
     screen->removeIcon(this);
 
   if (timer) {