From 4ce361d9ba9c6d22131a167d81c4bfd3674bbbe7 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 14 Feb 2020 17:06:30 +0100
Subject: Issue #1441 - Guard appomni/greomni with UXP_CUSTOM_OMNI env var.

This adds an addition to the environment set up for child processes
(plugin container) so that it may still be able to pass the omni
parameters there as-needed.
---
 ipc/glue/GeckoChildProcessHost.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ipc/glue')

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))) {
-- 
cgit v1.2.3