summaryrefslogtreecommitdiff
path: root/src/managers/input/InputManager.cpp
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2024-05-04 00:48:25 +0100
committerVaxry <vaxry@vaxry.net>2024-05-04 00:48:25 +0100
commita3b4923c4218535878dcf68d27d8eca4ab3e0981 (patch)
tree2053b07618474f49c5a5a67bd8a1a8e7d6873a0f /src/managers/input/InputManager.cpp
parent1237732b97fcf21a19aed16f2ef966118a3ca2aa (diff)
input: ignore destroyed devices in static events
fixes #5863
Diffstat (limited to 'src/managers/input/InputManager.cpp')
-rw-r--r--src/managers/input/InputManager.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 10b12404..81ceae79 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -785,6 +785,10 @@ void CInputManager::setupKeyboard(SP<IKeyboard> keeb) {
keeb->events.destroy.registerStaticListener(
[this](void* owner, std::any data) {
auto PKEEB = ((IKeyboard*)owner)->self.lock();
+
+ if (!PKEEB)
+ return;
+
destroyKeyboard(PKEEB);
Debug::log(LOG, "Destroyed keyboard {:x}", (uintptr_t)owner);
},
@@ -995,6 +999,10 @@ void CInputManager::setupMouse(SP<IPointer> mauz) {
mauz->events.destroy.registerStaticListener(
[this](void* mouse, std::any data) {
const auto PMOUSE = (IPointer*)mouse;
+
+ if (!PMOUSE)
+ return;
+
destroyPointer(PMOUSE->self.lock());
},
mauz.get());
@@ -1384,6 +1392,10 @@ void CInputManager::newTouchDevice(wlr_input_device* pDevice) {
PNEWDEV->events.destroy.registerStaticListener(
[this](void* owner, std::any data) {
auto PDEV = ((ITouch*)owner)->self.lock();
+
+ if (!PDEV)
+ return;
+
destroyTouchDevice(PDEV);
},
PNEWDEV.get());