From 48a450083db59085921c79c2bb68dedd0b95821a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 26 Aug 2002 22:05:08 +0000 Subject: [PATCH] dont use an invalid iterator in handleKeypress, also, update _last_active is it needs to be --- util/epist/screen.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/util/epist/screen.cc b/util/epist/screen.cc index a67b0a37..c3ea4fb5 100644 --- a/util/epist/screen.cc +++ b/util/epist/screen.cc @@ -384,16 +384,19 @@ void screen::handleKeyrelease(const XEvent &) { // the only keyrelease event we care about (for now) is when we do stacked // cycling and the modifier is released if (_stacked_cycling && _cycling && nothingIsPressed()) { - XWindow *w = *_active; - // all modifiers have been released. ungrab the keyboard, move the // focused window to the top of the Z-order and raise it ungrabModifiers(); - _clients.remove(w); - _clients.push_front(w); - _active = _clients.begin(); - w->raise(); + if (_active != _clients.end()) { + XWindow *w = *_active; + bool e = _last_active == _active; + _clients.remove(w); + _clients.push_front(w); + _active = _clients.begin(); + if (e) _last_active = _active; + w->raise(); + } _cycling = false; } -- 2.44.0