Changeset 72363 in vbox for trunk/src

Timestamp:

May 28, 2018 4:49:10 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Fix for manual application quit procedure preventing it from quitting in some unwanted cases, like when there is startup error or other kind of warning shown before the UI is.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• main.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (2 diffs)
• runtime/UIMachine.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• selector/UISelectorWindow.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -481 +481 @@
                 break;
 
-            /* For Runtime UI: */
-            if (vboxGlobal().isVMConsoleProcess())
-            {
-                /* Prevent application from exiting when all window(s) closed: */
-                qApp->setQuitOnLastWindowClosed(false);
-            }
+            // WORKAROUND:
+            // Initially we wanted to make that workaround for Runtime UI only,
+            // because only there we had a strict handling for proper application quit
+            // procedure.  But it appeared on X11 (as usually due to an async nature) there
+            // can happen situations that Qt application is checking whether at least one
+            // window is already shown and if not - exits prematurely _before_ it is actually
+            // shown.  That can happen for example if window is not yet shown because blocked
+            // by startup error message-box which is not treated as real window by some
+            // reason.  So we are making application exit manual everywhere.
+            qApp->setQuitOnLastWindowClosed(false);
 
             /* Request to Start UI _after_ QApplication executed: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -142 +142 @@
 }
 
+void UIMachine::closeRuntimeUI()
+{
+    /* Quit application: */
+    QApplication::quit();
+}
+
 void UIMachine::sltChangeVisualState(UIVisualStateType visualState)
 {
@@ -304 +310 @@
     /* Cleanup session UI: */
     cleanupSession();
-
-    /* Quit application: */
-    QApplication::quit();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -71 +71 @@
 
     /** Close Runtime UI. */
-    void closeRuntimeUI() { destroy(); }
+    void closeRuntimeUI();
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1417 +1417 @@
 #endif /* VBOX_WS_MAC */
 
+void UISelectorWindow::closeEvent(QCloseEvent *pEvent)
+{
+    /* Call to base-class: */
+    QIWithRetranslateUI<QIMainWindow>::closeEvent(pEvent);
+
+    /* Quit application: */
+    QApplication::quit();
+}
+
 void UISelectorWindow::prepare()
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -224 +224 @@
       * @{ */
         /** Handles translation event. */
-        virtual void retranslateUi();
-
-        /** Handles any Qt @a pEvent. */
-        virtual bool event(QEvent *pEvent);
-        /** Handles Qt show @a pEvent. */
-        virtual void showEvent(QShowEvent *pEvent);
-        /** Handles first Qt show @a pEvent. */
-        virtual void polishEvent(QShowEvent *pEvent);
+        virtual void retranslateUi() /* override */;
+
+        /** Handles any @a pEvent. */
+        virtual bool event(QEvent *pEvent) /* override */;
+        /** Handles show @a pEvent. */
+        virtual void showEvent(QShowEvent *pEvent) /* override */;
+        /** Handles first show @a pEvent. */
+        virtual void polishEvent(QShowEvent *pEvent) /* override */;
 #ifdef VBOX_WS_MAC
-        /** Mac OS X: Preprocesses any Qt @a pEvent for passed @a pObject. */
-        virtual bool eventFilter(QObject *pObject, QEvent *pEvent);
-#endif /* VBOX_WS_MAC */
+        /** Mac OS X: Preprocesses any @a pEvent for passed @a pObject. */
+        virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
+#endif
+        /** Handles close @a pEvent. */
+        virtual void closeEvent(QCloseEvent *pEvent) /* override */;
     /** @} */