From 1040728e39b8b898d6e96b79a4c7bfcd0cb3f027 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 17 Feb 2025 20:16:55 +0100 Subject: [PATCH] GUI: no need to unregister input device if list is destroyed Fixes: QTBUG-133776 Pick-to: 6.9 6.8 Change-Id: If4a148e3ebf753ccd661a5ed1b321dbd7751576e Reviewed-by: Shawn Rutledge Reviewed-by: Liang Qi --- src/gui/kernel/qinputdevice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/kernel/qinputdevice.cpp b/src/gui/kernel/qinputdevice.cpp index 3ef8ad10c7d..25f16c4a7d8 100644 --- a/src/gui/kernel/qinputdevice.cpp +++ b/src/gui/kernel/qinputdevice.cpp @@ -356,6 +356,9 @@ void QInputDevicePrivate::registerDevice(const QInputDevice *dev) */ void QInputDevicePrivate::unregisterDevice(const QInputDevice *dev) { + if (deviceList.isDestroyed()) + return; // nothing to remove! + QMutexLocker lock(&devicesMutex); deviceList()->removeOne(dev); qCInfo(lcQpaInputDevices) << "Unregistered" << dev;