summaryrefslogtreecommitdiffstats
path: root/toolkit/xre
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-06-30 18:34:19 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-06-30 18:34:19 +0200
commitfdc6f820ca5e4b2832a0208e2a183fb1d6f8b45f (patch)
tree755b63ee019ebc289e3dcfcb0e7bbeec2931b48c /toolkit/xre
parent92a7dcc5b77e4f78ad97cc9e8b870f9635422c6c (diff)
downloadUXP-fdc6f820ca5e4b2832a0208e2a183fb1d6f8b45f.tar
UXP-fdc6f820ca5e4b2832a0208e2a183fb1d6f8b45f.tar.gz
UXP-fdc6f820ca5e4b2832a0208e2a183fb1d6f8b45f.tar.lz
UXP-fdc6f820ca5e4b2832a0208e2a183fb1d6f8b45f.tar.xz
UXP-fdc6f820ca5e4b2832a0208e2a183fb1d6f8b45f.zip
Bug 1413868.
Diffstat (limited to 'toolkit/xre')
-rw-r--r--toolkit/xre/nsAppRunner.cpp5
-rw-r--r--toolkit/xre/nsEmbedFunctions.cpp4
2 files changed, 9 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);
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 1498b0d17..3757dec2f 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -52,6 +52,7 @@
#include "base/process_util.h"
#include "chrome/common/child_process.h"
+#include "mozilla/FilePreferences.h"
#include "mozilla/ipc/BrowserProcessSubThread.h"
#include "mozilla/ipc/GeckoChildProcessHost.h"
#include "mozilla/ipc/IOThreadChild.h"
@@ -546,6 +547,9 @@ XRE_InitChildProcess(int aArgc,
::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY);
#endif
+ mozilla::FilePreferences::InitDirectoriesWhitelist();
+ mozilla::FilePreferences::InitPrefs();
+
OverrideDefaultLocaleIfNeeded();
// Run the UI event loop on the main thread.