From f8f32b363d66fba6f4ab5ad81be507256137195c Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 16 Sep 2018 11:36:38 +0200 Subject: [PATCH] Fix an assertion when looking for wine64 Closes #740 --- source/backend/plugin/CarlaPluginBridge.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/source/backend/plugin/CarlaPluginBridge.cpp b/source/backend/plugin/CarlaPluginBridge.cpp index 4a9f96a30..153c80a59 100644 --- a/source/backend/plugin/CarlaPluginBridge.cpp +++ b/source/backend/plugin/CarlaPluginBridge.cpp @@ -164,12 +164,18 @@ protected: String wineCMD; if (options.wine.executable != nullptr && options.wine.executable[0] != '\0') + { wineCMD = options.wine.executable; + + if (fBinary.endsWithIgnoreCase("64.exe") + && options.wine.executable[0] == CARLA_OS_SEP + && File(wineCMD + "64").existsAsFile()) + wineCMD += "64"; + } else + { wineCMD = "wine"; - - if (fBinary.endsWithIgnoreCase("64.exe") && File(wineCMD + "64").existsAsFile()) - wineCMD += "64"; + } arguments.add(wineCMD); }