From ac77eeb98e83152bcb12f2c961592a9854179169 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 4 Sep 2017 11:00:38 +0100 Subject: [PATCH] Fix Prepend case for environment variables (!) --- renderdoc/os/posix/posix_process.cpp | 6 ++++-- renderdoc/os/win32/win32_process.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/renderdoc/os/posix/posix_process.cpp b/renderdoc/os/posix/posix_process.cpp index 637c220f1..e668bd16c 100644 --- a/renderdoc/os/posix/posix_process.cpp +++ b/renderdoc/os/posix/posix_process.cpp @@ -192,10 +192,12 @@ void Process::ApplyEnvironmentModification() { if(!value.empty()) { + std::string prep = m.value; if(m.sep == EnvSep::Platform || m.sep == EnvSep::Colon) - value += ":"; + prep += ":"; else if(m.sep == EnvSep::SemiColon) - value += ";"; + prep += ";"; + value = prep + value; } else { diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index e7a1c4005..aace1964c 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -133,10 +133,12 @@ void Process::ApplyEnvironmentModification() { if(!value.empty()) { + std::string prep = m.value; if(m.sep == EnvSep::Platform || m.sep == EnvSep::SemiColon) - value += ";"; + prep += ";"; else if(m.sep == EnvSep::Colon) - value += ":"; + prep += ":"; + value = prep + value; } else {