Changeset 41015 in vbox

Timestamp:

Apr 20, 2012 9:13:11 PM (13 years ago)

Author:

vboxsync

Message:

VBoxCOM: proper uninitialization even if com::Initialize failed very early

File:

• trunk/src/VBox/Main/glue/EventQueue.cpp (modified) (1 diff)

trunk/src/VBox/Main/glue/EventQueue.cpp

@@ -238 +238 @@
 int EventQueue::uninit()
 {
-    Assert(sMainQueue);
-    /* Must process all events to make sure that no NULL event is left
-     * after this point. It would need to modify the state of sMainQueue. */
+    if (sMainQueue)
+    {
+        /* Must process all events to make sure that no NULL event is left
+         * after this point. It would need to modify the state of sMainQueue. */
 #ifdef RT_OS_DARWIN /* Do not process the native runloop, the toolkit may not be ready for it. */
-    sMainQueue->mEventQ->ProcessPendingEvents();
+        sMainQueue->mEventQ->ProcessPendingEvents();
 #else
-    sMainQueue->processEventQueue(0);
+        sMainQueue->processEventQueue(0);
 #endif
-    delete sMainQueue;
-    sMainQueue = NULL;
+        delete sMainQueue;
+        sMainQueue = NULL;
+    }
     return VINF_SUCCESS;
 }