mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 14:54:56 +01:00
Ignore ARDOUR_DATA_PATH env variable on windows
The variable is unset (and unused), windows_search_path() is used on that platform. This prevents the "ARDOUR_DATA_PATH not set in environment" message from being printed.
This commit is contained in:
parent
c51c254fae
commit
e6496ab032
1 changed files with 2 additions and 1 deletions
|
|
@ -290,13 +290,14 @@ ardour_data_search_path ()
|
||||||
search_path += user_config_directory();
|
search_path += user_config_directory();
|
||||||
#ifdef PLATFORM_WINDOWS
|
#ifdef PLATFORM_WINDOWS
|
||||||
search_path += windows_search_path ();
|
search_path += windows_search_path ();
|
||||||
#endif
|
#else
|
||||||
std::string s = Glib::getenv("ARDOUR_DATA_PATH");
|
std::string s = Glib::getenv("ARDOUR_DATA_PATH");
|
||||||
if (s.empty()) {
|
if (s.empty()) {
|
||||||
std::cerr << _("ARDOUR_DATA_PATH not set in environment\n");
|
std::cerr << _("ARDOUR_DATA_PATH not set in environment\n");
|
||||||
} else {
|
} else {
|
||||||
search_path += Searchpath (s);
|
search_path += Searchpath (s);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
return search_path;
|
return search_path;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue