screen_set_desktop(first);
}
- if (data->inter.any.interactive && data->inter.final) {
+ if (!data->inter.any.interactive || data->inter.final) {
screen_desktop_popup(0, FALSE);
first = (unsigned) -1;
}
data->desktopdir.inter.final,
data->desktopdir.inter.cancel);
if (!data->sendtodir.inter.any.interactive ||
- !data->sendtodir.inter.final)
+ !data->sendtodir.inter.final ||
+ data->sendtodir.inter.cancel)
{
screen_set_desktop(d);
}
data->sendtodir.inter.final,
data->sendtodir.inter.cancel);
if (!data->sendtodir.inter.any.interactive ||
- !data->sendtodir.inter.final)
+ !data->sendtodir.inter.final ||
+ data->sendtodir.inter.cancel)
{
client_set_desktop(c, d, data->sendtodir.follow);
if (data->sendtodir.follow)