X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=1705202bc319ad82f36df47b4b1cb653a73da11a;hb=37ccfef89546e38fe8c0ab1e039a8abdff8bd588;hp=0fa5d89b9fa49943657059e91ed39bf02a4321cd;hpb=217488ee3e1a7246bdfadb6a56f83a4a50a7c180;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 0fa5d89b..1705202b 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -472,14 +472,9 @@ void screen::updateClientList() {
     if (it == end) {  // didn't already exist
       if (doAddWindow(rootclients[i])) {
 //        cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
-        if (_stacked_cycling) {
-          // insert new clients after the active window
-          _clients.insert(insert_point, new XWindow(_epist, this,
-                                                    rootclients[i]));
-        } else {
-          // insert new clients at the front of the list
-          _clients.push_front(new XWindow(_epist, this, rootclients[i]));
-        }
+        // insert new clients after the active window
+        _clients.insert(insert_point, new XWindow(_epist, this,
+                                                  rootclients[i]));
       }
     }
   }
@@ -520,7 +515,9 @@ const XWindow *screen::lastActiveWindow() const {
   WindowList::const_iterator it, end = _clients.end();
   for (it = _clients.begin(); it != end; ++it)
     if ((*it)->getScreen() == this && ! (*it)->iconic() &&
-        ((*it)->desktop() == 0xffffffff || (*it)->desktop() == _active_desktop))
+        (*it)->canFocus() &&
+        ((*it)->desktop() == 0xffffffff ||
+         (*it)->desktop() == _active_desktop))
       return *it;
 
   // no windows on this screen