From 9aca27a192919b50e006a5fbd21d43f85d17ceb4 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sun, 17 Oct 2021 16:15:48 +0200 Subject: [PATCH] Don't filter out empty environment variables This check was only needed because `operator[]` inserts an empty entry if the variable doesn't exist. Wine also complains when `WINEPREFIX` is empty, so we should probably not try to have our own behavior here. --- src/common/utils.cpp | 4 ++-- src/plugin/utils.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/utils.cpp b/src/common/utils.cpp index 696ae91e..0be1c281 100644 --- a/src/common/utils.cpp +++ b/src/common/utils.cpp @@ -42,10 +42,10 @@ constexpr char temp_dir_override_env_var[] = "YABRIDGE_TEMP_DIR"; fs::path get_temporary_directory() { const bp::environment env = boost::this_process::environment(); if (const auto directory = env.find(temp_dir_override_env_var); - directory != env.end() && !directory->empty()) { + directory != env.end()) { return directory->to_string(); } else if (const auto directory = env.find("XDG_RUNTIME_DIR"); - directory != env.end() && !directory->empty()) { + directory != env.end()) { return directory->to_string(); } else { return fs::temp_directory_path(); diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp index 879ffbd5..6e32b4c9 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp @@ -257,8 +257,7 @@ fs::path normalize_plugin_path(const fs::path& windows_library_path, std::variant find_wine_prefix( fs::path windows_plugin_path) { const bp::environment env = boost::this_process::environment(); - if (const auto prefix = env.find("WINEPREFIX"); - prefix != env.end() && !prefix->empty()) { + if (const auto prefix = env.find("WINEPREFIX"); prefix != env.end()) { return OverridenWinePrefix{prefix->to_string()}; }