Show Wine prefix overrides on the startup output

This might otherwise cause confusion, since otherwise the printed Wine
prefix might not actually be the prefix that will be used.
This commit is contained in:
Robbert van der Helm
2020-06-20 01:01:48 +02:00
parent 471d87bc16
commit 56af346277
2 changed files with 15 additions and 3 deletions
+2
View File
@@ -22,6 +22,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
Mixbus6.
- Fixed plugin group socket name generation. This prevented plugin groups with
the same name from being used simultaneously in multiple Wine prefixes.
- Fixed manual Wine prefix overides through the `WINEPREFIX` environment
variable not being reflected in the output shwon in startup.
## [1.2.0] - 2020-05-29
+13 -3
View File
@@ -23,6 +23,7 @@
#include "../common/communication.h"
#include "../common/events.h"
namespace bp = boost::process;
// I'd rather use std::filesystem instead, but Boost.Process depends on
// boost::filesystem
namespace fs = boost::filesystem;
@@ -592,9 +593,18 @@ void PluginBridge::log_init_message() {
init_msg << "plugin: '" << vst_plugin_path.string() << "'"
<< std::endl;
init_msg << "socket: '" << socket_endpoint.path() << "'" << std::endl;
init_msg << "wine prefix: '"
<< find_wineprefix().value_or("<default>").string() << "'"
<< std::endl;
init_msg << "wine prefix: '";
// If the Wine prefix is manually overridden, then this should be made
// clear. This follows the behaviour of `set_wineprefix()`.
bp::native_environment env = boost::this_process::environment();
if (!env["WINEPREFIX"].empty()) {
init_msg << env["WINEPREFIX"].to_string() << " <overridden>";
} else {
init_msg << find_wineprefix().value_or("<default>").string();
}
init_msg << "'" << std::endl;
init_msg << "wine version: '" << wine_version << "'" << std::endl;
init_msg << std::endl;