From 8693eaa8ffbd3d61053b5bbece3be2d55aca5a54 Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Sat, 29 Aug 2020 13:32:37 +0100 Subject: [PATCH] Revert "placement: don't alter desk during restarts/recaptures" This reverts commit cdf9975b362bce8d85407f8ad6dc8c73a1a24e80. --- fvwm/placement.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fvwm/placement.c b/fvwm/placement.c index a34f5765b..d5ece518c 100644 --- a/fvwm/placement.c +++ b/fvwm/placement.c @@ -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; @@ -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);