Changeset 97388 in vbox

Timestamp:

Nov 3, 2022 4:45:21 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: VirtualBox Manager: Commit data handler for proper application cleanup in case when complex sub-dialogs opened.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -631 +631 @@
 #endif /* VBOX_WS_X11 */
 
+void UIVirtualBoxManager::sltHandleCommitData()
+{
+    /* Close the sub-dialogs first: */
+    sltCloseManagerWindow(UIToolType_Extensions);
+    sltCloseManagerWindow(UIToolType_Media);
+    sltCloseManagerWindow(UIToolType_Network);
+    sltCloseManagerWindow(UIToolType_Cloud);
+    sltCloseManagerWindow(UIToolType_CloudConsole);
+}
+
 void UIVirtualBoxManager::sltHandleMediumEnumerationFinish()
 {
@@ -2162 +2172 @@
 
     /* UICommon connections: */
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVirtualBoxManager::sltHandleCommitData);
     connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished,
             this, &UIVirtualBoxManager::sltHandleMediumEnumerationFinish);
@@ -2409 +2421 @@
 void UIVirtualBoxManager::cleanup()
 {
-    /* Close the sub-dialogs first: */
-    sltCloseManagerWindow(UIToolType_Extensions);
-    sltCloseManagerWindow(UIToolType_Media);
-    sltCloseManagerWindow(UIToolType_Network);
-    sltCloseManagerWindow(UIToolType_Cloud);
-    sltCloseManagerWindow(UIToolType_CloudConsole);
+    /* Ask sub-dialogs to commit data: */
+    sltHandleCommitData();
 
     /* Cleanup: */

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

@@ -130 +130 @@
         /** Handles request to update actions. */
         void sltHandleUpdateActionAppearanceRequest() { updateActionsAppearance(); }
+
+        /** Handles request to commit data. */
+        void sltHandleCommitData();
 
         /** Handles signal about medium-enumeration finished. */