From 6ddeaa273a1bbbb740cc1ffb63529c838d50ba28 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 24 Mar 2020 14:27:36 +0100 Subject: Do not use openGL backed canvas + widgets on Catalina This needs testing: local builds on Catalina vs. running existing (10.6, 10.11) builds on 10.15. --- gtk2_ardour/bundle_env_cocoa.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gtk2_ardour/bundle_env_cocoa.cc') diff --git a/gtk2_ardour/bundle_env_cocoa.cc b/gtk2_ardour/bundle_env_cocoa.cc index 1ae39c6452..68a7cd50d6 100644 --- a/gtk2_ardour/bundle_env_cocoa.cc +++ b/gtk2_ardour/bundle_env_cocoa.cc @@ -99,6 +99,13 @@ fixup_bundle_environment (int argc, char* argv[], string & localedir) setup_logging (); } + if (query_darwin_version () >= 19) { + /* on Catalina, do not use NSGLView */ + g_setenv ("ARDOUR_NSGL", "0", 0); + } else { + g_setenv ("ARDOUR_NSGL", "1", 0); + } + no_app_nap (); if (!g_getenv ("ARDOUR_BUNDLED")) { -- cgit v1.2.3