diff options
| -rw-r--r-- | util/epist/screen.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/epist/screen.cc b/util/epist/screen.cc index 2a4d5a70..7dfca51f 100644 --- a/util/epist/screen.cc +++ b/util/epist/screen.cc @@ -444,7 +444,8 @@ void screen::updateActiveWindow() { } } _active = it; - _last_active = it; + if (it != end) + _last_active = it; /* cout << "Active window is now: "; if (_active == _clients.end()) cout << "None\n"; @@ -514,7 +515,9 @@ void screen::cycleWindow(const bool forward, const bool allscreens, return; } while ((*target)->iconic() || (! allscreens && (*target)->getScreen() != this) || - (! alldesktops && (*target)->desktop() != _active_desktop) || + (! alldesktops && + (*target)->desktop() != _active_desktop && + (*target)->desktop() != 0xffffffff) || (sameclass && ! classname.empty() && (*target)->appClass() != classname)); |