diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-15 13:24:08 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-15 13:24:08 +0100 |
| commit | 37c72d2fc3c8993628f2991a4bcaad510dbdc406 (patch) | |
| tree | 5fcf2c79139f201d0161b4727a625322acb87a54 /ipc | |
| parent | d3c6522c48b90d5f746758bfac70f76b932f010f (diff) | |
| parent | 9600e2dc87ca84994ef2867ae1e81428da05cd06 (diff) | |
| download | UXP-37c72d2fc3c8993628f2991a4bcaad510dbdc406.tar UXP-37c72d2fc3c8993628f2991a4bcaad510dbdc406.tar.gz UXP-37c72d2fc3c8993628f2991a4bcaad510dbdc406.tar.lz UXP-37c72d2fc3c8993628f2991a4bcaad510dbdc406.tar.xz UXP-37c72d2fc3c8993628f2991a4bcaad510dbdc406.zip | |
Merge branch 'release' into Pale_Moon-release
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/glue/GeckoChildProcessHost.cpp | 1 |
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))) { |