more focus issues with linear cycling and tabbed windows

1 files changed, 2 insertions, 2 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 19d0bf8..f469521 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -87,9 +87,9 @@ void FocusControl::cycleFocus(int opts, bool cycle_reverse) {
     FocusedWindows *window_list = (opts & CYCLELINEAR) ? &m_creation_order_list : &m_focused_list;
     if (!m_cycling_focus) {
         m_cycling_focus = true;
-        if ((opts & CYCLELINEAR) && m_cycling_window != m_focused_list.end()) {
+        if (opts & CYCLELINEAR) {
             m_cycling_creation_order = true;
-            m_cycling_window = find(window_list->begin(),window_list->end(),*m_cycling_window);
+            m_cycling_window = find(window_list->begin(),window_list->end(),s_focused_window);
         } else {
             m_cycling_creation_order = (opts & CYCLELINEAR);
             m_cycling_window = window_list->begin();