576bf975cc85f923ac4ad9012fb61920d69c5ebc

 1diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
 2index 2e3c2e81fd190f03ca1f2dfb3deb308f4fdbcce1..5adf331fd1092ac15e13e809ebb5d7e67c3876a5 100644
 3--- a/src/Hy3Layout.cpp
 4+++ b/src/Hy3Layout.cpp
 5@@ -635,7 +635,7 @@ std::string Hy3Layout::getLayoutName() { return "hy3"; }
 6 
 7 PHLWINDOW Hy3Layout::getNextWindowCandidate(PHLWINDOW window) {
 8 	if (window->m_pWorkspace->m_bHasFullscreenWindow) {
 9-		return g_pCompositor->getFullscreenWindowOnWorkspace(window->m_pWorkspace->m_iID);
10+		return window->m_pWorkspace->getFullscreenWindow();
11 	}
12 
13 	PHLWINDOW selection;
14@@ -1098,8 +1098,8 @@ void Hy3Layout::moveNodeToWorkspace(const PHLWORKSPACE& origin, std::string wsna
15 
16 		changeNodeWorkspaceRecursive(*node, workspace);
17 		this->insertNode(*node);
18-		g_pCompositor->updateWorkspaceWindows(origin->m_iID);
19-		g_pCompositor->updateWorkspaceWindows(workspace->m_iID);
20+		origin->updateWindows();
21+		workspace->updateWindows();
22 	}
23 
24 	if (follow) {