summaryrefslogtreecommitdiff
path: root/gtk2_ardour/bundle_env_cocoa.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-12-14 10:22:25 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2019-12-14 10:22:25 -0700
commitdd509d1eca49d44efef3299f7042fb2286a263fd (patch)
treec05e61cd2407699d547237d4efebfdbc9934bd4b /gtk2_ardour/bundle_env_cocoa.cc
parentffc7bd122e5359d1ffe94ef6a8cae4dc9a7b29bf (diff)
move i/o redirect for macOS bundle before no_app_nap() and comment
Diffstat (limited to 'gtk2_ardour/bundle_env_cocoa.cc')
-rw-r--r--gtk2_ardour/bundle_env_cocoa.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc
index 387e461711..6c05fbea77 100644
--- a/gtk2_ardour/bundle_env_cocoa.cc
+++ b/gtk2_ardour/bundle_env_cocoa.cc
@@ -87,7 +87,16 @@ setup_logging (void)
void
fixup_bundle_environment (int argc, char* argv[], string & localedir)
{
- /* do this even for non-bundle runtimes */
+ /* if running from a bundle, stdout/stderr will be redirect to null by
+ * launchd. That's not useful for anyone, so fix that. Use the same
+ * mechanism is not running from a bundle, but ARDOUR_LOGGING is
+ * set. This allows us to test the stderr/stdout redirects directly
+ * from ./ardev.
+ */
+
+ if (g_getenv ("ARDOUR_BUNDLED") || g_getenv ("ARDOUR_LOGGING")) {
+ setup_logging ();
+ }
no_app_nap ();
@@ -100,15 +109,6 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir)
set_language_preference ();
- /* if running from a bundle, stdout/stderr will be redirect to null, so
- * we want ASL logging. If not, we're probably running in a terminal
- * and we don't want ASL logging.
- */
-
- if (g_getenv ("ARDOUR_BUNDLED") || g_getenv ("ARDOUR_LOGGING")) {
- setup_logging ();
- }
-
char execpath[MAXPATHLEN+1];
uint32_t pathsz = sizeof (execpath);