X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=715d012e6b50c48da83749895205e9673ac931ab;hb=22e8615f6125cc117af9e01124b9bcc2b19c59ab;hp=97a7ee732a1a2de7163e68a810d6d42a1a0a4e4d;hpb=551a17d2563679eb6ef7c650f1384ee7e48dbc29;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 97a7ee73..715d012e 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -85,11 +85,18 @@ void Workspace::addWindow(BlackboxWindow *w, bool place, bool sticky) {
 
   stackingList.push_front(w);
 
-  if (w->isNormal()) {
+  if (! sticky)
+    w->setWorkspace(id);
+  
+  if (! w->isNormal()) {
     if (! sticky) {
-      w->setWorkspace(id);
-      w->setWindowNumber(windowList.size());
+      // just give it some number, else bad things happen as it is assumed to
+      // not be on a workspace
+      w->setWindowNumber(0);
     }
+  } else {
+    if (! sticky)
+      w->setWindowNumber(windowList.size());
 
     windowList.push_back(w);