Linear cycling wasn't affecting normal cycling order (Mark)

2 files changed, 4 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 516104b..b7dc0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc2:
 *06/06/28:
+   * Linear cycling wasn't affecting normal cycling order (Mark)
+     WorkspaceCmd.cc
    * Little cleanup of dead functions (Mark)
      Workspace.cc/hh
    * Fixed more focus issues with linear cycling and tabbed windows (Mark)
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index f98db1a..3bd79c5 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -55,8 +55,7 @@ void NextWindowCmd::execute() {
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (!fb->watchingScreen() &&
-                    !(m_option & FocusControl::CYCLELINEAR))
+                if (!fb->watchingScreen())
                     Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().nextFocus(m_option);
             }
@@ -78,8 +77,7 @@ void PrevWindowCmd::execute() {
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (!fb->watchingScreen()
-                    && !(m_option & FocusControl::CYCLELINEAR))
+                if (!fb->watchingScreen())
                     Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().prevFocus(m_option);
             }