From 98dbee72ac38ea9b573d935f4406fab1004d9cd0 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 12 Sep 2009 18:15:32 +0200 Subject: [PATCH] Bugfix: Correctly initialize workspace when moving clients (Thanks tsdh) --- src/commands.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/commands.c b/src/commands.c index 802f0fd4..b034bbbd 100644 --- a/src/commands.c +++ b/src/commands.c @@ -577,18 +577,12 @@ static void move_current_window_to_workspace(xcb_connection_t *conn, int workspa if (to_focus == NULL) to_focus = CIRCLEQ_PREV_OR_NULL(&(container->clients), current_client, clients); - if (t_ws->screen == NULL) { - LOG("initializing new workspace, setting num to %d\n", workspace-1); - t_ws->screen = container->workspace->screen; - /* Copy the dimensions from the virtual screen */ - memcpy(&(t_ws->rect), &(container->workspace->screen->rect), sizeof(Rect)); - } else { - /* Check if there is already a fullscreen client on the destination workspace and - * stop moving if so. */ - if (current_client->fullscreen && (t_ws->fullscreen_client != NULL)) { - LOG("Not moving: Fullscreen client already existing on destination workspace.\n"); - return; - } + workspace_initialize(t_ws, container->workspace->screen); + /* Check if there is already a fullscreen client on the destination workspace and + * stop moving if so. */ + if (current_client->fullscreen && (t_ws->fullscreen_client != NULL)) { + LOG("Not moving: Fullscreen client already existing on destination workspace.\n"); + return; } Container *to_container = t_ws->table[t_ws->current_col][t_ws->current_row];