Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

shared: fix flagging of new_desk #687

Merged
merged 1 commit into from
Sep 4, 2022
Merged

shared: fix flagging of new_desk #687

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions fvwm/virtual.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,6 +1706,13 @@ void goto_desk(int desk, struct monitor *m)
}

TAILQ_FOREACH(m2, &monitor_q, entry) {
/* If we're swapping a desktop between monitors for
* shared mode, only do this when the is_swapping flag
* is true, otherwise events would be raised for a
* new_desk for monitors/desks which have not changed.
*/
if (m != m2 && !m2->virtual_scr.is_swapping)
continue;
if (m != m2) {
m2->Desktops = m->Desktops;
if (!is_tracking_shared) {
Expand Down Expand Up @@ -2494,12 +2501,11 @@ void CMD_GotoDesk(F_CMD_ARGS)
this_desk_now);

m_loop->virtual_scr.is_swapping = true;
m->virtual_scr.is_swapping = true;

goto_desk(this_desk_now, m_loop);
goto_desk(new_desk, m);

m_loop->virtual_scr.is_swapping = false;

m->virtual_scr.is_swapping = true;
goto_desk(new_desk, m);
m->virtual_scr.is_swapping = false;

return;
Expand Down