if (data->inter.any.interactive)
screen_desktop_popup(data->desktop.desk, TRUE);
}
- }
-
- if (!data->inter.any.interactive || data->inter.final)
+ } else
screen_desktop_popup(0, FALSE);
}
!data->sendtodir.inter.final ||
data->sendtodir.inter.cancel)
{
- screen_set_desktop(d, TRUE);
+ if (d != screen_desktop) screen_set_desktop(d, TRUE);
}
}
data->sendtodir.inter.cancel)
{
client_set_desktop(c, d, data->sendtodir.follow);
- if (data->sendtodir.follow)
+ if (data->sendtodir.follow && d != screen_desktop)
screen_set_desktop(d, TRUE);
}
}