From 10ead326e430b3e52754e9229679d6cb8b3e5813 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 6 Jan 2011 00:42:01 +0000
Subject: [PATCH] backport from 2.X: arm (and thus save) global environment
 before messing it with it in bundled version

git-svn-id: svn://localhost/ardour2/branches/3.0@8455 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/main.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 827425c321..0a90c147ef 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -112,6 +112,8 @@ fixup_bundle_environment ()
 		return;
 	}
 
+        EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true));
+
 	set_language_preference ();
 
 	char execpath[MAXPATHLEN+1];
@@ -309,7 +311,7 @@ fixup_bundle_environment (int argc, char* argv[])
 		return;
 	}
 	
-        EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency);
+        EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true));
 
 	Glib::ustring exec_path = argv[0];
 	Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (exec_path));