Changeset 102722 in vbox

Timestamp:

Dec 28, 2023 1:03:41 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: UIVirtualBoxManager: A bit of cleanup for Open Global/Machine Tool stuff; Make sure corresponding manager window is closed for the case if global/machine tool being opened embedded way.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2207 +2207 @@
 void UIVirtualBoxManager::sltPerformShowGlobalTool(QAction *pAction)
 {
+    /* Sanity checks: */
     AssertPtrReturnVoid(pAction);
     AssertPtrReturnVoid(m_pWidget);
+
+    /* Acquire tool type: */
+    const UIToolType enmType = pAction->property("UIToolType").value<UIToolType>();
+    AssertReturnVoid(enmType != UIToolType_Invalid);
+
+    /* Make sure global item is selected: */
     m_pWidget->switchToGlobalItem();
-    m_pWidget->setToolsTypeGlobal(pAction->property("UIToolType").value<UIToolType>());
+
+    /* Make sure corresponding manager window is closed (if any): */
+    sltCloseManagerWindow(enmType);
+
+    /* Open the tool finally: */
+    m_pWidget->setToolsTypeGlobal(enmType);
 }
 
 void UIVirtualBoxManager::sltPerformShowMachineTool(QAction *pAction)
 {
+    /* Sanity checks: */
     AssertPtrReturnVoid(pAction);
     AssertPtrReturnVoid(m_pWidget);
-    m_pWidget->setToolsTypeMachine(pAction->property("UIToolType").value<UIToolType>());
+
+    /* Acquire tool type: */
+    const UIToolType enmType = pAction->property("UIToolType").value<UIToolType>();
+    AssertReturnVoid(enmType != UIToolType_Invalid);
+
+    /* Make sure corresponding manager window is closed (if any): */
+    sltCloseManagerWindow(enmType);
+
+    /* Open the tool finally: */
+    m_pWidget->setToolsTypeMachine(enmType);
 }