From 16f1d1b99b9ac4ae89fc04d00fcd16cd4e3cd302 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Mon, 5 Sep 2022 22:35:41 +0200
Subject: [PATCH] guard unsafe state in unmap ls

---
 src/events/Layers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp
index d41821a8..a98d5d70 100644
--- a/src/events/Layers.cpp
+++ b/src/events/Layers.cpp
@@ -158,7 +158,7 @@ void Events::listener_unmapLayerSurface(void* owner, void* data) {
 
     Debug::log(LOG, "LayerSurface %x unmapped", layersurface->layerSurface);
 
-    if (!g_pCompositor->getMonitorFromID(layersurface->monitorID)) {
+    if (!g_pCompositor->getMonitorFromID(layersurface->monitorID) || g_pCompositor->m_bUnsafeState) {
         Debug::log(WARN, "Layersurface unmapping on invalid monitor (removed?) ignoring.");
 
         g_pCompositor->addToFadingOutSafe(layersurface);