- for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
- if (it->data != focus_client && client_normal(it->data))
- if (client_focus(it->data))
+ for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
+ if (it->data != focus_client && client_normal(it->data)) {
+ /* if we're switching desktops, and we get the already focused
+ window, then we wont get a FocusIn for it, so just restore
+ the focus_client so that we know it is focused */
+ if (it->data == old) {
+ focus_client = old;