Changeset 88681 in vbox

Timestamp:

Apr 23, 2021 3:15:11 PM (4 years ago)

Author:

vboxsync

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

143995

Message:

FE/Qt: bugref:8161: Fixing regression in r143970; We should detach UIChooser COM stuff before COM itself is cleaned up; Otherwise any we have COM related warnings on XPCOM hosts.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (3 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)
• UIChooserModel.cpp (modified) (2 diffs)
• UIChooserModel.h (modified) (2 diffs)

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

@@ -406 +406 @@
     makeSureGroupSettingsSaveIsFinished();
     makeSureGroupDefinitionsSaveIsFinished();
-
-    /* Delete tree: */
-    delete m_pInvisibleRootNode;
-    m_pInvisibleRootNode = 0;
 }
 
@@ -778 +774 @@
         addLocalMachineIntoTheTree(comMachine, true /* make it visible */);
     }
+}
+
+void UIChooserAbstractModel::sltDetachCOM()
+{
+    /* Delete tree: */
+    delete m_pInvisibleRootNode;
+    m_pInvisibleRootNode = 0;
 }
 
@@ -994 +997 @@
 {
     /* UICommon connections: */
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
+            this, &UIChooserAbstractModel::sltDetachCOM);
     connect(&uiCommon(), &UICommon::sigCloudMachineUnregistered,
             this, &UIChooserAbstractModel::sltCloudMachineUnregistered);

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

@@ -187 +187 @@
         /** Handles reload machine with certain @a uMachineId request. */
         virtual void sltReloadMachine(const QUuid &uMachineId);
+
+        /** Handles command to detach COM. */
+        virtual void sltDetachCOM();
     /** @} */
 

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

@@ -85 +85 @@
     /* Load settings: */
     loadSettings();
-}
-
-void UIChooserModel::deinit()
-{
-    /* Clean tree for main root: */
-    clearTreeForMainRoot();
-
-    /* Call to base-class: */
-    UIChooserAbstractModel::deinit();
 }
 
@@ -1206 +1197 @@
     /* Notify listeners about selection change: */
     emit sigSelectionChanged();
+}
+
+void UIChooserModel::sltDetachCOM()
+{
+    /* Clean tree for main root: */
+    clearTreeForMainRoot();
+
+    /* Call to base-class: */
+    UIChooserAbstractModel::sltDetachCOM();
 }
 

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

@@ -97 +97 @@
         /** Inits model. */
         virtual void init() /* override */;
-        /** Deinits model. */
-        virtual void deinit() /* override */;
 
         /** Returns the action-pool reference. */
@@ -283 +281 @@
         /** Handles reload machine with certain @a uMachineId request. */
         virtual void sltReloadMachine(const QUuid &uMachineId) /* override */;
+
+        /** Handles command to detach COM. */
+        virtual void sltDetachCOM() /* override */;
     /** @} */