Changeset 48907 in vbox

Timestamp:

Oct 5, 2013 10:59:26 PM (11 years ago)

Author:

vboxsync

Message:

GUI: The media-boffin must be destroyed _AFTER_ the guys using it, otherways you have races.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• selector/graphics/details/UIGDetailsElements.cpp (modified) (2 diffs)

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

@@ -4368 +4368 @@
     UIExtraDataEventHandler::destroy();
 
+    /* Destroy the GUI root windows _BEFORE_ the media-mess, because there is
+       code in the GUI that's using the media code an will be racing us! */
+    if (mSelectorWnd)
+    {
+        delete mSelectorWnd;
+        mSelectorWnd = NULL;
+    }
+
+    if (m_pVirtualMachine)
+    {
+        delete m_pVirtualMachine;
+        m_pVirtualMachine = NULL;
+    }
+
     /* Cleanup medium-enumerator: */
     m_mediumEnumeratorDtorRwLock.lockForWrite();
@@ -4374 +4388 @@
     m_mediumEnumeratorDtorRwLock.unlock();
 
-    if (mSelectorWnd)
-        delete mSelectorWnd;
-    if (m_pVirtualMachine)
-        delete m_pVirtualMachine;
-
+    /* Destroy whatever this converter stuff is: */
     UIConverter::cleanup();
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * VBox frontends: Qt GUI ("VirtualBox"):
- * UIGDetailsDetails class implementation
+ * VBox Qt GUI - UIGDetailsDetails class implementation.
  */
 
@@ -62 +60 @@
 UIGDetailsElementInterface::~UIGDetailsElementInterface()
 {
-    /* VBoxGlobal must still be valid at this point, otherwise our thread might
-       be doing really bad things to already deleted memory! */
-    Assert(vboxGlobal().isValid());
-    Assert(!vboxGlobal().isCleaningUp());
-
     cleanupThread();
 }