Changeset 80802 in vbox

Timestamp:

Sep 15, 2019 8:58:27 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133369

Message:

FE/Qt: bugref:8938: VirtualBox Manager: Chooser and Tools pane: Fixing regression introduced by r133351, that's an old bug revealed (not created) by that commit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• chooser/UIChooserModel.cpp (modified) (2 diffs)
• chooser/UIChooserModel.h (modified) (1 diff)
• tools/UIToolsModel.cpp (modified) (3 diffs)
• tools/UIToolsModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1295 +1295 @@
 }
 
+void UIChooserModel::cleanupConnections()
+{
+    /* Disconnect selection-changed & selection-invalidated signal prematurelly.
+     * Keep in mind, we are using static_cast instead of qobject_cast here to be
+     * sure connection is disconnected even if parent is self-destroyed. */
+    disconnect(this, &UIChooserModel::sigSelectionChanged,
+               static_cast<UIChooser*>(parent()), &UIChooser::sigSelectionChanged);
+    disconnect(this, &UIChooserModel::sigSelectionInvalidated,
+               static_cast<UIChooser*>(parent()), &UIChooser::sigSelectionInvalidated);
+}
+
 void UIChooserModel::cleanupHandlers()
 {
@@ -1321 +1332 @@
 void UIChooserModel::cleanup()
 {
+    cleanupConnections();
     cleanupHandlers();
     cleanupContextMenu();

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -309 +309 @@
         void saveLastSelectedItem();
         /** Cleanups connections. */
+        void cleanupConnections();
+        /** Cleanups handlers. */
         void cleanupHandlers();
         /** Cleanups context-menu. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -497 +497 @@
     /* Setup parent connections: */
     connect(this, &UIToolsModel::sigSelectionChanged,
-        qobject_cast<UITools*>(parent()), &UITools::sigSelectionChanged);
+            qobject_cast<UITools*>(parent()), &UITools::sigSelectionChanged);
     connect(this, &UIToolsModel::sigExpandingStarted,
             qobject_cast<UITools*>(parent()), &UITools::sigExpandingStarted);
@@ -539 +539 @@
 }
 
+void UIToolsModel::cleanupConnections()
+{
+    /* Disconnect selection-changed signal prematurelly.
+     * Keep in mind, we are using static_cast instead of qobject_cast here to be
+     * sure connection is disconnected even if parent is self-destroyed. */
+    disconnect(this, &UIToolsModel::sigSelectionChanged,
+               static_cast<UITools*>(parent()), &UITools::sigSelectionChanged);
+}
+
 void UIToolsModel::cleanupHandlers()
 {
@@ -562 +571 @@
 void UIToolsModel::cleanup()
 {
+    /* Cleanup connections: */
+    cleanupConnections();
     /* Cleanup handlers: */
     cleanupHandlers();

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -225 +225 @@
         void saveLastSelectedItems();
         /** Cleanups connections. */
+        void cleanupConnections();
+        /** Cleanups connections. */
         void cleanupHandlers();
         /** Cleanups items. */