From 5eeec8860e2dc8ff80dda26243778b5ecc923ca2 Mon Sep 17 00:00:00 2001
From: vaxerski <vaxry@vaxry.net>
Date: Fri, 19 Jan 2024 16:20:22 +0100
Subject: core: improve cleanup logic

---
 src/managers/input/InputManager.cpp | 3 +++
 src/managers/input/InputManager.hpp | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'src/managers/input')

diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index ce7e2b30..5a98accb 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -1185,6 +1185,9 @@ void CInputManager::onKeyboardKey(wlr_keyboard_key_event* e, SKeyboard* pKeyboar
 
         updateKeyboardsLeds(pKeyboard->keyboard);
     }
+
+    if (m_bExitTriggered)
+        g_pCompositor->cleanup();
 }
 
 void CInputManager::onKeyboardMod(void* data, SKeyboard* pKeyboard) {
diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp
index 5fa5824e..eec45eff 100644
--- a/src/managers/input/InputManager.hpp
+++ b/src/managers/input/InputManager.hpp
@@ -243,6 +243,8 @@ class CInputManager {
 
     void restoreCursorIconToApp(); // no-op if restored
 
+    bool m_bExitTriggered = false; // for exit dispatcher
+
     friend class CKeybindManager;
     friend class CWLSurface;
 };
-- 
cgit v1.2.3