From 94b5c536ba3c136ac228d357050953b30a86674a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 14 Aug 2013 16:36:50 +0000 Subject: [PATCH] Mac: Don't call OverrideChildProcessPath in child processes (issue #806). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1358 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/common/main_delegate.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libcef/common/main_delegate.cc b/libcef/common/main_delegate.cc index 95958cd6a..51b3f2faf 100644 --- a/libcef/common/main_delegate.cc +++ b/libcef/common/main_delegate.cc @@ -335,11 +335,15 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) { } void CefMainDelegate::PreSandboxStartup() { + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + #if defined(OS_MACOSX) - OverrideChildProcessPath(); + if (!command_line.HasSwitch(switches::kProcessType)) { + // Only override the child process path when executing the main process. + OverrideChildProcessPath(); + } #endif - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); if (command_line.HasSwitch(switches::kDisablePackLoading)) content_client_.set_pack_loading_disabled(true);