Skip to content

#188: Fix environment variable path separator on Windows #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HughMacdonald wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

#188: Fix environment variable path separator on Windows #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/global_store/src/global_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ bool xstudio::global_store::load_preferences(
// folders
char *plugin_path = std::getenv("XSTUDIO_PLUGIN_PATH");
if (plugin_path) {
for (const auto &p : xstudio::utility::split(plugin_path, ':')) {
#ifdef _WIN32
char path_env_var_sep = ';';
#else
char path_env_var_sep = ':';
#endif
for (const auto &p : xstudio::utility::split(plugin_path, path_env_var_sep)) {
if (fs::is_directory(p + "/preferences"))
preference_load_defaults(prefs, p + "/preferences");
}
Expand Down
7 changes: 6 additions & 1 deletion src/plugin_manager/src/plugin_manager_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ PluginManagerActor::PluginManagerActor(caf::actor_config &cfg) : caf::event_base
// xstudio plugins
char *plugin_path = std::getenv("XSTUDIO_PLUGIN_PATH");
if (plugin_path) {
for (const auto &p : xstudio::utility::split(plugin_path, ':')) {
#ifdef _WIN32
char path_env_var_sep = ';';
#else
char path_env_var_sep = ':';
#endif
for (const auto &p : xstudio::utility::split(plugin_path, path_env_var_sep)) {
manager_.emplace_front_path(p);
}
}
Expand Down
7 changes: 6 additions & 1 deletion src/ui/qml/studio/src/qml_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,12 @@ void xstudio::ui::qml::setup_xstudio_qml_emgine(QQmlEngine *engine, caf::actor_s
// with plugins
char *plugin_path = std::getenv("XSTUDIO_PLUGIN_PATH");
if (plugin_path) {
for (const auto &p : xstudio::utility::split(plugin_path, ':')) {
#ifdef _WIN32
char path_env_var_sep = ';';
#else
char path_env_var_sep = ':';
#endif
for (const auto &p : xstudio::utility::split(plugin_path, path_env_var_sep)) {

// note - some xSTUDIO plugins have the backend plugin component
// and a Qt/QML plugin component built into the same binary.
Expand Down