diff options
| author | Robin Gareus <robin@gareus.org> | 2019-10-23 22:54:19 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-10-23 22:54:19 +0200 |
| commit | 9cae196a047b87252c3f6e80716865a78e3edf31 (patch) | |
| tree | 23cbc8b3cc07a1a10094b1e1203caa126dc21e14 /gtk2_ardour/bundle_env_cocoa.cc | |
| parent | 7060ba4c1dc732fb95e9fa4ac60bbc1c26e15469 (diff) | |
Allow to run Ardour without start-script on MacOS
This might break JACK, since the previous environment
is no longer re-set before calling JackConnection::open(), then
again, no Ardour does not un/set any critical env variables on MacOS.
Diffstat (limited to 'gtk2_ardour/bundle_env_cocoa.cc')
| -rw-r--r-- | gtk2_ardour/bundle_env_cocoa.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc index 807f994156..9ba3e9311a 100644 --- a/gtk2_ardour/bundle_env_cocoa.cc +++ b/gtk2_ardour/bundle_env_cocoa.cc @@ -86,11 +86,12 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir) no_app_nap (); - if (!g_getenv ("ARDOUR_BUNDLED")) { - return; + if (g_getenv ("ARDOUR_SELF")) { + g_setenv ("ARDOUR_SELF", argv[0]); + } + if (g_getenv ("PREBUNDLE_ENV")) { + EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV")); } - - EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV")); set_language_preference (); |