зеркало из https://github.com/mozilla/pjs.git
Bug 386748 - Warning on Startup: NS_ENSURE_TRUE(compMgr) failed. r=benjamin, a1.9=schrep
This commit is contained in:
Родитель
667ae20e7a
Коммит
2c7514e9ba
|
@ -240,11 +240,14 @@ nsXREDirProvider::GetFile(const char* aProperty, PRBool* aPersistent,
|
||||||
!strcmp(aProperty, XRE_USER_APP_DATA_DIR)) {
|
!strcmp(aProperty, XRE_USER_APP_DATA_DIR)) {
|
||||||
rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));
|
rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));
|
||||||
}
|
}
|
||||||
#ifdef XP_WIN
|
|
||||||
else if (!strcmp(aProperty, XRE_UPDATE_ROOT_DIR)) {
|
else if (!strcmp(aProperty, XRE_UPDATE_ROOT_DIR)) {
|
||||||
|
#ifdef XP_WIN
|
||||||
rv = GetUpdateRootDir(getter_AddRefs(file));
|
rv = GetUpdateRootDir(getter_AddRefs(file));
|
||||||
}
|
#else
|
||||||
|
// Only supported on Windows, so just immediately fail.
|
||||||
|
return NS_ERROR_FAILURE;
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
else if (!strcmp(aProperty, NS_APP_APPLICATION_REGISTRY_FILE)) {
|
else if (!strcmp(aProperty, NS_APP_APPLICATION_REGISTRY_FILE)) {
|
||||||
rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));
|
rv = GetUserAppDataDirectory((nsILocalFile**)(nsIFile**) getter_AddRefs(file));
|
||||||
if (NS_SUCCEEDED(rv))
|
if (NS_SUCCEEDED(rv))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче