Changeset 60631 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 21, 2016 3:43:38 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​bugref:7958: Make sure to cleanup available-screen-area calculation workers properly before re-creating them.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -131 +131 @@
     m_cHostScreenCount = cHostScreenCount != -1 ? cHostScreenCount : m_pDesktopWidget->screenCount();
 
-    /* Resize vectors to new host-screen count: */
+    /* Cleanup existing workers first: */
+    foreach (QWidget *pWorker, m_availableGeometryWorkers)
+        pWorker->disconnect();
     qDeleteAll(m_availableGeometryWorkers);
     m_availableGeometryWorkers.clear();
+    m_availableGeometryData.clear();
+
+    /* Resize workers vectors to new host-screen count: */
     m_availableGeometryWorkers.resize(m_cHostScreenCount);
-    m_availableGeometryData.clear();
     m_availableGeometryData.resize(m_cHostScreenCount);
 
@@ -203 +207 @@
     disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
 
-    /* Cleanup existing workers: */
+    /* Cleanup existing workers finally: */
+    foreach (QWidget *pWorker, m_availableGeometryWorkers)
+        pWorker->disconnect();
     qDeleteAll(m_availableGeometryWorkers);
     m_availableGeometryWorkers.clear();
+    m_availableGeometryData.clear();
 }