Changeset 59493 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 27, 2016 3:46:41 PM (9 years ago)

Author:

vboxsync

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

105261

Message:

FE/Qt: ​​​bugref:8200: Preventing race crash on QApp startup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -4664 +4664 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-bool VBoxGlobal::showUI()
+void VBoxGlobal::showUI()
 {
     /* Load application settings: */
@@ -4672 +4672 @@
     if (!isVMConsoleProcess())
     {
-        /* Make sure Selector UI is permitted: */
+        /* Make sure Selector UI is permitted, quit if not: */
         if (appSettings.isFeatureActive("noSelector"))
         {
             msgCenter().cannotStartSelector();
-            return false;
+            return QApplication::quit();
         }
 
@@ -4698 +4698 @@
     else
     {
-        /* Make sure machine is started: */
+        /* Make sure machine is started, quit if not: */
         if (!UIMachine::startMachine(vboxGlobal().managedVMUuid()))
-            return false;
-    }
-
-    /* True by default: */
-    return true;
+            return QApplication::quit();
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -194 +194 @@
     bool processArgs();
 
-    /** Shows UI. */
-    bool showUI();
-
     bool switchToMachine(CMachine &machine);
 
@@ -503 +500 @@
     void prepare();
     void cleanup();
+
+    /** Shows UI. */
+    void showUI();
 
     /** Handles the VBoxSVC availability change. */

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

@@ -519 +519 @@
                 break;
 
-            /* Exit if VBoxGlobal is unable to show UI: */
-            if (!vboxGlobal().showUI())
-                break;
+            /* Request to Show UI _after_ QApplication started: */
+            QMetaObject::invokeMethod(&vboxGlobal(), "showUI", Qt::QueuedConnection);
 
             /* Start application: */