From f7c8663f67d3109a6b775370b17e636a3fabfe5f Mon Sep 17 00:00:00 2001 From: Consolatis <35009135+Consolatis@users.noreply.github.com> Date: Thu, 29 Dec 2022 04:49:13 +0100 Subject: [PATCH] src/workspaces.c: use cached server pointer --- src/workspaces.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/workspaces.c b/src/workspaces.c index d7036b8d..90614e5d 100644 --- a/src/workspaces.c +++ b/src/workspaces.c @@ -241,22 +241,23 @@ void workspaces_switch_to(struct workspace *target) { assert(target); - if (target == target->server->workspace_current) { + struct server *server = target->server; + if (target == server->workspace_current) { return; } /* Disable the old workspace */ wlr_scene_node_set_enabled( - &target->server->workspace_current->tree->node, false); + &server->workspace_current->tree->node, false); /* Enable the new workspace */ wlr_scene_node_set_enabled(&target->tree->node, true); /* Save the last visited workspace */ - target->server->workspace_last = target->server->workspace_current; + server->workspace_last = server->workspace_current; /* Make sure new views will spawn on the new workspace */ - target->server->workspace_current = target; + server->workspace_current = target; /** * Make sure we are focusing what the user sees. @@ -267,7 +268,7 @@ workspaces_switch_to(struct workspace *target) desktop_focus_topmost_mapped_view(target->server); /* And finally show the OSD */ - _osd_show(target->server); + _osd_show(server); } void -- 2.52.0