diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 17:51:09 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-02 17:51:09 +0200 |
| commit | 4c9914227ed9e675d65ad16e0bb899e8107a0ee5 (patch) | |
| tree | d4c542f51b5155eb3f3627c628686cfc0d648a2f /toolkit/xre/nsAppRunner.cpp | |
| parent | de01f1e7fce43d5919e6adcd73dfa617a9087520 (diff) | |
| parent | aa6329b694a981dccd5b0fd124936c4b54fb94a4 (diff) | |
| download | UXP-4c9914227ed9e675d65ad16e0bb899e8107a0ee5.tar UXP-4c9914227ed9e675d65ad16e0bb899e8107a0ee5.tar.gz UXP-4c9914227ed9e675d65ad16e0bb899e8107a0ee5.tar.lz UXP-4c9914227ed9e675d65ad16e0bb899e8107a0ee5.tar.xz UXP-4c9914227ed9e675d65ad16e0bb899e8107a0ee5.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'toolkit/xre/nsAppRunner.cpp')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index e43aea926..40f9ead79 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -9,6 +9,7 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Attributes.h" +#include "mozilla/FilePreferences.h" #include "mozilla/ChaosMode.h" #include "mozilla/IOInterposer.h" #include "mozilla/Likely.h" @@ -3740,6 +3741,10 @@ XREMain::XRE_mainRun() mDirProvider.DoStartup(); + // As FilePreferences need the profile directory, we must initialize right here. + mozilla::FilePreferences::InitDirectoriesWhitelist(); + mozilla::FilePreferences::InitPrefs(); + OverrideDefaultLocaleIfNeeded(); appStartup->GetShuttingDown(&mShuttingDown); |