Changeset 26607 in vbox for trunk/src/VBox

Timestamp:

Feb 17, 2010 12:42:37 PM (15 years ago)

Author:

vboxsync

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

57800

Message:

Frontends/VBoxHeadless: register the VirtualBox callback as late as possible. This shouldn't change the behavior, but reduces the risk of deadlocks during startup due to callbacks.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -1013 +1013 @@
         gEventQ = com::EventQueue::getMainEventQueue();
 
-        /* VirtualBox callback registration. */
-        vboxCallback = new VirtualBoxCallback();
-        vboxCallback->AddRef();
-        CHECK_ERROR(virtualBox, RegisterCallback(vboxCallback));
-        vboxCallback->Release();
-        if (FAILED (rc))
-            break;
-
         /* register a callback for machine events */
         {
@@ -1111 +1103 @@
         }
 
+        /* VirtualBox callback registration. */
+        vboxCallback = new VirtualBoxCallback();
+        vboxCallback->AddRef();
+        CHECK_ERROR(virtualBox, RegisterCallback(vboxCallback));
+        vboxCallback->Release();
+        if (FAILED(rc))
+            break;
+
 #ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
         signal(SIGINT, SaveState);