From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 17 Feb 2025 19:16:55 +0000 (+0100)
Subject: [PATCH] GUI: no need to unregister input device if list is destroyed
X-Git-Tag: archive/raspbian/6.8.2+dfsg-9+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2f2b75fe0a260da7f8236d1d3cbe799fe484eef;p=qt6-base.git

[PATCH] GUI: no need to unregister input device if list is destroyed

Fixes: QTBUG-133776
Change-Id: If4a148e3ebf753ccd661a5ed1b321dbd7751576e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 1040728e39b8b898d6e96b79a4c7bfcd0cb3f027)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6ad615cd1218a9b7f4204c04288ae2d6ed6c232b)

Gbp-Pq: Name upstream_prevent_unregistering_input_device.diff
---

diff --git a/src/gui/kernel/qinputdevice.cpp b/src/gui/kernel/qinputdevice.cpp
index 3ef8ad10..25f16c4a 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;