diff --git a/dtool/src/dtoolutil/executionEnvironment.cxx b/dtool/src/dtoolutil/executionEnvironment.cxx index ca8f45d876..96ae7fd147 100644 --- a/dtool/src/dtoolutil/executionEnvironment.cxx +++ b/dtool/src/dtoolutil/executionEnvironment.cxx @@ -217,9 +217,11 @@ get_cwd() { */ bool ExecutionEnvironment:: ns_has_environment_variable(const string &var) const { -#ifdef PREREAD_ENVIRONMENT - return _variables.count(var) != 0; -#else + if (_variables.count(var) != 0) { + return true; + } + +#ifndef PREREAD_ENVIRONMENT return getenv(var.c_str()) != nullptr; #endif }