summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-01-06 00:42:01 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-01-06 00:42:01 +0000
commit10ead326e430b3e52754e9229679d6cb8b3e5813 (patch)
tree51d0672898a2cecd93ad102793b7caa8e31acbe0 /gtk2_ardour
parent1f8e12a1b1cd5d6e4d2ec4961f6c50c671bf75b1 (diff)
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
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/main.cc4
1 files changed, 3 insertions, 1 deletions
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));