M util/epist/screen.cc → util/epist/screen.cc

@@ -490,8 +490,6 @@ if (target == end) {
         target = begin;
       } else {
         ++target;
-        if (target == end)
-          target = begin;
       }
     } else {
       if (target == begin)
@@ -502,6 +500,10 @@ 
     // must be no window to focus
     if (target == _active)
       return;
+
+    // start back at the beginning of the loop
+    if (target == end)
+      continue;
 
     // determine if this window is invalid for cycling to
     const XWindow *t = *target;