Changeset 16674 in vbox for trunk

Timestamp:

Feb 11, 2009 4:05:15 PM (16 years ago)

Author:

vboxsync

Message:

Main/Glue: com::Initialize(): Cleanup a failed XPCOM initialization before trying with a new path.

File:

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

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

@@ -456 +456 @@
 
         /* Finally, initialize XPCOM */
-        nsCOMPtr <nsIServiceManager> serviceManager;
-        rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager),
-                            appDir, dsProv);
-
-        if (NS_SUCCEEDED (rc))
-        {
-            nsCOMPtr <nsIComponentRegistrar> registrar =
-                do_QueryInterface (serviceManager, &rc);
+        {
+            nsCOMPtr <nsIServiceManager> serviceManager;
+            rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager),
+                                appDir, dsProv);
+
             if (NS_SUCCEEDED (rc))
             {
-                rc = registrar->AutoRegister (nsnull);
+                nsCOMPtr <nsIComponentRegistrar> registrar =
+                    do_QueryInterface (serviceManager, &rc);
                 if (NS_SUCCEEDED (rc))
                 {
-                    /* We succeeded, stop probing paths */
-                    LogFlowFunc (("Succeeded.\n"));
-                    break;
+                    rc = registrar->AutoRegister (nsnull);
+                    if (NS_SUCCEEDED (rc))
+                    {
+                        /* We succeeded, stop probing paths */
+                        LogFlowFunc (("Succeeded.\n"));
+                        break;
+                    }
                 }
             }
         }
+
+        /* clean up before the new try */
+        rc = NS_ShutdownXPCOM (nsnull);
 
         if (i == 0)