Skip to content

Commit

Permalink
Revert "placement: don't alter desk during restarts/recaptures"
Browse files Browse the repository at this point in the history
This reverts commit cdf9975.
  • Loading branch information
ThomasAdam committed Aug 29, 2020
1 parent 9f3ec1b commit 8693eaa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fvwm/placement.c
Original file line number Diff line number Diff line change
Expand Up @@ -1738,6 +1738,7 @@ static int __place_window(
/* Don't alter the existing desk location during Capture/Recapture. */
if (!win_opts->flags.do_override_ppos)
{
fprintf(stderr, "%s: setting desk!\n", __func__);
struct monitor *m = fw->m ? fw->m : monitor_get_current();
fw->Desk = m->virtual_scr.CurrentDesk;
reason->desk.reason = PR_DESK_CURRENT;
Expand Down Expand Up @@ -1905,8 +1906,7 @@ static int __place_window(
}

/* Check the desk here. */
if (!SUSE_START_ON_DESK(&pstyle->flags) &&
((!Restarting && Scr.flags.are_windows_captured))) {
if (!SUSE_START_ON_DESK(&pstyle->flags)) {
struct monitor *mnew = FindScreenOfXY(attr_g->x, attr_g->y);
fw->m = mnew;
do_move_window_to_desk(fw, mnew->virtual_scr.CurrentDesk);
Expand Down

0 comments on commit 8693eaa

Please sign in to comment.