hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-07 21:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

input: ignore destroyed devices in static events

Browse source 
fixes #5863
This commit is contained in:
Vaxry 2024-05-04 00:48:25 +01:00
parent 1237732b97
commit a3b4923c42
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/managers/input/InputManager.cpp
View file

@ -785,6 +785,10 @@ void CInputManager::setupKeyboard(SP<IKeyboard> keeb) {
keeb->events.destroy.registerStaticListener( keeb->events.destroy.registerStaticListener(
[this](void* owner, std::any data) { [this](void* owner, std::any data) {
auto PKEEB = ((IKeyboard*)owner)->self.lock(); auto PKEEB = ((IKeyboard*)owner)->self.lock();
if (!PKEEB)
return;
destroyKeyboard(PKEEB); destroyKeyboard(PKEEB);
Debug::log(LOG, "Destroyed keyboard {:x}", (uintptr_t)owner); Debug::log(LOG, "Destroyed keyboard {:x}", (uintptr_t)owner);
}, },
@ -995,6 +999,10 @@ void CInputManager::setupMouse(SP<IPointer> mauz) {
mauz->events.destroy.registerStaticListener( mauz->events.destroy.registerStaticListener(
[this](void* mouse, std::any data) { [this](void* mouse, std::any data) {
const auto PMOUSE = (IPointer*)mouse; const auto PMOUSE = (IPointer*)mouse;
if (!PMOUSE)
return;
destroyPointer(PMOUSE->self.lock()); destroyPointer(PMOUSE->self.lock());
}, },
mauz.get()); mauz.get());
@ -1384,6 +1392,10 @@ void CInputManager::newTouchDevice(wlr_input_device* pDevice) {
PNEWDEV->events.destroy.registerStaticListener( PNEWDEV->events.destroy.registerStaticListener(
[this](void* owner, std::any data) { [this](void* owner, std::any data) {
auto PDEV = ((ITouch*)owner)->self.lock(); auto PDEV = ((ITouch*)owner)->self.lock();
if (!PDEV)
return;
destroyTouchDevice(PDEV); destroyTouchDevice(PDEV);
}, },
PNEWDEV.get()); PNEWDEV.get());