From 5f8634adbb58600b93897bcbcc1b20c4e92450dd Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Sun, 28 Nov 2021 12:57:10 +0100 Subject: [PATCH] fix closing fullscreen window --- src/windowManager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/windowManager.cpp b/src/windowManager.cpp index dd31e79..d51e9e3 100644 --- a/src/windowManager.cpp +++ b/src/windowManager.cpp @@ -744,8 +744,12 @@ void CWindowManager::eatWindow(CWindow* a, CWindow* toEat) { void CWindowManager::closeWindowAllChecks(int64_t id) { // fix last window if tile const auto CLOSEDWINDOW = g_pWindowManager->getWindowFromDrawable(id); - if (CLOSEDWINDOW && !CLOSEDWINDOW->getIsFloating()) { - g_pWindowManager->fixWindowOnClose(CLOSEDWINDOW); + if (CLOSEDWINDOW) { + if (!CLOSEDWINDOW->getIsFloating()) + g_pWindowManager->fixWindowOnClose(CLOSEDWINDOW); + + if (const auto WORKSPACE = getWorkspaceByID(CLOSEDWINDOW->getWorkspaceID()); WORKSPACE && CLOSEDWINDOW->getFullscreen()) + WORKSPACE->setHasFullscreenWindow(false); } // delete off of the arr