summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/epist/screen.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 7dfca51f..2c1da1ae 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -421,7 +421,8 @@ const XWindow *screen::lastActiveWindow() const {
// find a window if one exists
WindowList::const_iterator it, end = _clients.end();
for (it = _clients.begin(); it != end; ++it)
- if ((*it)->getScreen() == this)
+ if ((*it)->getScreen() == this && ! (*it)->iconic() &&
+ ((*it)->desktop() == 0xffffffff || (*it)->desktop() == _active_desktop))
return *it;
// no windows on this screen