summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-02-15 13:24:38 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-02-15 13:24:38 +0100
commit39a3d75915ae6a150c4a2402210afea59bae0b15 (patch)
tree5a6ec08450b436a2f4a5bf93ef3faf3a9d635393 /ipc
parent1a6fa0b0956700db90d8ebbfbe73a1fce12556cf (diff)
parent9600e2dc87ca84994ef2867ae1e81428da05cd06 (diff)
downloadUXP-39a3d75915ae6a150c4a2402210afea59bae0b15.tar
UXP-39a3d75915ae6a150c4a2402210afea59bae0b15.tar.gz
UXP-39a3d75915ae6a150c4a2402210afea59bae0b15.tar.lz
UXP-39a3d75915ae6a150c4a2402210afea59bae0b15.tar.xz
UXP-39a3d75915ae6a150c4a2402210afea59bae0b15.zip
Merge branch 'release' into Basilisk-releasev2020.02.18
Diffstat (limited to 'ipc')
-rw-r--r--ipc/glue/GeckoChildProcessHost.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
index ea76f85f0..9e83a8729 100644
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -712,6 +712,7 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
if (Omnijar::IsInitialized()) {
// Make sure that child processes can find the omnijar
// See XRE_InitCommandLine in nsAppRunner.cpp
+ newEnvVars["UXP_CUSTOM_OMNI"] = 1;
nsAutoCString path;
nsCOMPtr<nsIFile> file = Omnijar::GetPath(Omnijar::GRE);
if (file && NS_SUCCEEDED(file->GetNativePath(path))) {