From f53a64396aa3a5a928ba8e33663f1fc3395b0ffb Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 12 Jul 2017 17:12:39 +0200
Subject: [PATCH] Ref T103, not all executables on MacOSX are bundles

---
 src/blackmisc/directoryutils.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp
index 9879e5be9..0d980a6fb 100644
--- a/src/blackmisc/directoryutils.cpp
+++ b/src/blackmisc/directoryutils.cpp
@@ -51,9 +51,14 @@ namespace BlackMisc
         Q_ASSERT_X(CBuildConfig::isKnownExecutableName(executable), Q_FUNC_INFO, "Unknown exectuable");
 
         QString s = CFileUtils::appendFilePaths(CDirectoryUtils::binDirectory(), executable);
-        if (CDirectoryUtils::isMacOSXAppBundle())
+        if (CBuildConfig::isRunningOnMacOSXPlatform())
         {
-            s += QLatin1String(".app/Contents/MacOS/") + executable;
+            // Mac OSX bundle may or may not be a bundle
+            const QDir dir(s + QLatin1String(".app/Contents/MacOS"));
+            if (dir.exists())
+            {
+                s += QLatin1String(".app/Contents/MacOS/") + executable;
+            }
         }
         else if (CBuildConfig::isRunningOnWindowsNtPlatform())
         {