r=darin, sr=dougt, a=mkaply
Move creation of event queue before component registration
This commit is contained in:
mkaply%us.ibm.com 2003-08-13 20:08:20 +00:00
Родитель 9d5109e553
Коммит 254585acda
1 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -563,6 +563,12 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result,
}
#endif
nsCOMPtr<nsIEventQueueService> eventQService(do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv));
if ( NS_FAILED(rv) ) return rv;
rv = eventQService->CreateThreadEventQueue();
if ( NS_FAILED(rv) ) return rv;
if ( NS_FAILED(rv) || CheckAndRemoveUpdateFile()) {
// if we find no persistent registry, we will try to autoregister
// the default components directory.
@ -611,12 +617,6 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result,
nsIInterfaceInfoManager* iim = XPTI_GetInterfaceInfoManager();
NS_IF_RELEASE(iim);
nsCOMPtr<nsIEventQueueService> eventQService(do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv));
if ( NS_FAILED(rv) ) return rv;
rv = eventQService->CreateThreadEventQueue();
if ( NS_FAILED(rv) ) return rv;
// Notify observers of xpcom autoregistration start
NS_CreateServicesFromCategory(NS_XPCOM_STARTUP_OBSERVER_ID,
nsnull,