diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
| commit | 73575c10ce3ede1637e4f959b56e1f7d5f110b91 (patch) | |
| tree | 9af1e7061d53dcc62be4000fc206cfcaa71cc4a8 /openbox/focus_cycle.c | |
| parent | 4f414ed0f124fa67b61d347899aa3b30aa0294f1 (diff) | |
| parent | f163c46eaf01ced8405fa36a3bf4a5c488f0f5aa (diff) | |
Merge branch 'backport' into work
Conflicts:
Makefile.am
openbox/actions/focus.c
openbox/config.c
openbox/event.c
openbox/menuframe.c
Diffstat (limited to 'openbox/focus_cycle.c')
| -rw-r--r-- | openbox/focus_cycle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index a616db64..a70151fd 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -54,9 +54,10 @@ void focus_cycle_stop(ObClient *ifclient) { /* stop focus cycling if the given client is a valid focus target, and so the cycling is being disrupted */ - if (focus_cycle_target && ifclient && - (ifclient == focus_cycle_target || - focus_cycle_popup_is_showing(ifclient))) + if (focus_cycle_target && + ((ifclient && (ifclient == focus_cycle_target || + focus_cycle_popup_is_showing(ifclient))) || + !ifclient)) { focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); |