Changeset 25812 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jan 13, 2010 5:18:52 PM (15 years ago)

Author:

vboxsync

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

56585

Message:

Main: back out r56580 partially which broke VirtualBox startup

File:

• trunk/src/VBox/Main/glue/initterm.cpp (modified) (4 diffs)

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

@@ -246 +246 @@
 {
     HRESULT rc = E_FAIL;
-
-    RTTHREAD hSelf = RTThreadSelf();
-    bool fIsMainThread = RTThreadIsMain(hSelf);
 
 #if !defined (VBOX_WITH_XPCOM)
@@ -336 +333 @@
      *       counting, so this exercise is entirely for the EventQueue init. */
     bool fRc;
+    RTTHREAD hSelf = RTThreadSelf ();
     if (hSelf != NIL_RTTHREAD)
         ASMAtomicCmpXchgHandle (&gCOMMainThread, hSelf, NIL_RTTHREAD, fRc);
@@ -349 +347 @@
         return rc;
     }
-    Assert(fIsMainThread);
+    Assert (RTThreadIsMain (hSelf));
 
     /* this is the first main thread initialization */
@@ -380 +378 @@
         return rc;
     }
-    Assert(fIsMainThread);
+    Assert (RTThreadIsMain (RTThreadSelf()));
 
     /* this is the first initialization */