forked from zotan/snowleopard
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
|
|
index dac063c8a17fc..4bdd21bca9588 100644
|
|
--- a/toolkit/xre/nsXREDirProvider.cpp
|
|
+++ b/toolkit/xre/nsXREDirProvider.cpp
|
|
@@ -455,16 +455,10 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
|
|
}
|
|
#endif // defined(MOZ_CONTENT_TEMP_DIR)
|
|
else if (!strcmp(aProperty, NS_APP_USER_CHROME_DIR)) {
|
|
- // It isn't clear why this uses GetProfileStartupDir instead of
|
|
- // GetProfileDir. It could theoretically matter in a non-main
|
|
- // process where some other directory provider has defined
|
|
- // NS_APP_USER_PROFILE_50_DIR. In that scenario, using
|
|
- // GetProfileStartupDir means this will fail instead of succeed.
|
|
- rv = GetProfileStartupDir(getter_AddRefs(file));
|
|
- if (NS_FAILED(rv)) {
|
|
- return rv;
|
|
- }
|
|
- rv = file->AppendNative("chrome"_ns);
|
|
+ bool persistent = false;
|
|
+ rv = GetFile(NS_GRE_DIR, &persistent, getter_AddRefs(file));
|
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
|
+ rv = file->AppendNative("distribution"_ns);
|
|
} else if (!strcmp(aProperty, NS_APP_PREFS_50_DIR)) {
|
|
rv = GetProfileDir(getter_AddRefs(file));
|
|
if (NS_FAILED(rv)) {
|