From 3537050fbca64838a1d5db47c5fbd17dcdcabf90 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Tue, 9 Jun 2015 10:50:12 -0400 Subject: [PATCH] don't check DISPLAY on __APPLE__ machines --- openbr/openbr_plugin.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 791a633..633301e 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -1072,9 +1072,13 @@ void br::Context::initialize(int &argc, char *argv[], QString sdkPath, bool useG QString sep; #ifndef _WIN32 + #ifndef __APPLE__ + // Modern OS X will only define the DISPLAY environment variable if XQuartz + // is installed, so we only do this check on non-Apple Unix systems. useGui = useGui && (getenv("DISPLAY") != NULL); + #endif // __APPLE__ sep = ":"; -#else +#else // _WIN32 sep = ";"; #endif // not _WIN32 -- libgit2 0.21.4