X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=a67b0a37ec0ed7c62070170c6d26ad135099cd75;hb=b81dbf9af620472ac5661a6a778f92a646184ce8;hp=416bb9bdd1de097162447656aa2fdb4700e3bf17;hpb=da8d6b3f60a3eb39ca47cfcb9aa5b2f445050102;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 416bb9bd..a67b0a37 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -392,6 +392,7 @@ void screen::handleKeyrelease(const XEvent &) {
 
     _clients.remove(w);
     _clients.push_front(w);
+    _active = _clients.begin();
     w->raise();
 
     _cycling = false;
@@ -546,8 +547,9 @@ void screen::updateActiveWindow() {
      * cycle stack.
      */
     if (_stacked_cycling && !_cycling) {
-      _clients.remove(*_active);
-      _clients.push_front(*_active);
+      XWindow *win = *_active;
+      _clients.remove(win);
+      _clients.push_front(win);
       _active = _clients.begin();
     }