From 26238aca8c442736f380eb523ef48468f892bdb7 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Mon, 19 Oct 2015 14:49:27 -0700 Subject: Fix crash on process exit when the evdevtouch plugin is loaded The QGuiApplicationPrivate object is already destroyed by the time the plugins are cleaned up during the application destruction, causing a segmentation fault in updateInputDeviceCount(). There's no point in calling updateInputDeviceCount() in the destructor anyway as the whole process is on its way out that stage, and we don't support unloading plugins during the application lifetime otherwise, so the call can just be removed from the destructor. Change-Id: Id819d73cb8234ccedb6ea7c3e39950589ee680a1 Reviewed-by: Friedemann Kleint Reviewed-by: Laszlo Agocs --- src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp index 35a685ff21..57028495c5 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp @@ -91,7 +91,6 @@ QEvdevTouchManager::QEvdevTouchManager(const QString &key, const QString &specif QEvdevTouchManager::~QEvdevTouchManager() { qDeleteAll(m_activeDevices); - updateInputDeviceCount(); } void QEvdevTouchManager::addDevice(const QString &deviceNode) -- cgit v1.2.3