X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=5982f878a8bf2631394a043b73fd613ddeaa551d;hb=e81b9d6a722b45f8895e70aa108ba4f879b48572;hp=89ea8e7bc9fa31742555909c87c9178f1b6a38af;hpb=57fb41c8060eaa2f29b25b08e3813b3dc140f165;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 89ea8e7b..5982f878 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -86,8 +86,6 @@ Workspace::~Workspace(void) {
 const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
   if (! w) return -1;
 
-  if (place) placeWindow(*w);
-
   w->setWorkspace(id);
   w->setWindowNumber(_windows.size());
 
@@ -101,6 +99,8 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
 
   raiseWindow(w);
 
+  if (place) placeWindow(*w);
+
   return w->getWindowNumber();
 }
 
@@ -119,8 +119,6 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
           _zorder.empty() ||                    // click focus but no windows
           !_zorder.front()->setInputFocus()) {  // tried window, but wont focus
 	screen.getOpenbox().focusWindow((OpenboxWindow *) 0);
-        XSetInputFocus(screen.getOpenbox().getXDisplay(),
-                       PointerRoot, None, CurrentTime);
       }
     }
   }