include iconic windows when cycling

also, stop cycling on one screen when cycling begins on another

1 files changed, 2 insertions, 2 deletions

diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 5b5b607..800a672 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -55,7 +55,7 @@ void NextWindowCmd::execute() {
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (!fb->watchingScreen())
+                if (screen != fb->watchingScreen())
                     Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().nextFocus(m_option);
             }
@@ -77,7 +77,7 @@ void PrevWindowCmd::execute() {
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (!fb->watchingScreen())
+                if (screen != fb->watchingScreen())
                     Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().prevFocus(m_option);
             }