diff options
| author | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-09-28 08:53:16 (GMT) |
|---|---|---|
| committer | Henrik Kinnunen <fluxgen@fluxbox.org> | 2008-09-28 08:53:16 (GMT) |
| commit | f2c8868724ebcaa6afaac4a71093f77b7eeaa23f (patch) | |
| tree | e64111d54d58f819e261f4fa552fae8e111b30e8 /src/FocusControl.cc | |
| parent | bcf37890b617730cfded161b9a3d18f7c377e724 (diff) | |
| parent | 04a1d2a83b96eb6d1b1958e4f3e25ffdf295aa4d (diff) | |
| download | fluxbox-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.zip fluxbox-f2c8868724ebcaa6afaac4a71093f77b7eeaa23f.tar.bz2 | |
Merge branch 'master' of fluxbox@git.fluxbox.org:fluxbox
Conflicts:
ChangeLog
Diffstat (limited to 'src/FocusControl.cc')
| -rw-r--r-- | src/FocusControl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 9c531bb..ce46dcc 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
| @@ -91,7 +91,7 @@ void FocusControl::cycleFocus(const FocusableList &window_list, | |||
| 91 | const ClientPattern *pat, bool cycle_reverse) { | 91 | const ClientPattern *pat, bool cycle_reverse) { |
| 92 | 92 | ||
| 93 | if (!m_cycling_list) { | 93 | if (!m_cycling_list) { |
| 94 | if (&m_screen == FbTk::EventManager::instance()->grabbingKeyboard()) | 94 | if (m_screen.isCycling()) |
| 95 | // only set this when we're waiting for modifiers | 95 | // only set this when we're waiting for modifiers |
| 96 | m_cycling_list = &window_list; | 96 | m_cycling_list = &window_list; |
| 97 | m_was_iconic = 0; | 97 | m_was_iconic = 0; |