From 0f9dc2c9f182c31b93ca5972ef70a73818d1c5d4 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 15 Apr 2020 22:08:55 +0100 Subject: [PATCH] Replace wine function check for Z:\usr\ folder check Signed-off-by: falkTX --- source/backend/plugin/CarlaPluginJuce.cpp | 6 +----- source/discovery/carla-discovery.cpp | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/source/backend/plugin/CarlaPluginJuce.cpp b/source/backend/plugin/CarlaPluginJuce.cpp index 348e80b07..73eea6273 100644 --- a/source/backend/plugin/CarlaPluginJuce.cpp +++ b/source/backend/plugin/CarlaPluginJuce.cpp @@ -50,10 +50,6 @@ #include "JucePluginWindow.hpp" -namespace juce { -extern bool juce_isRunningInWine(); -} - CARLA_BACKEND_START_NAMESPACE // ------------------------------------------------------------------------------------------------------------------- @@ -1304,7 +1300,7 @@ public: #ifdef CARLA_OS_WIN // Fix for wine usage - if (juce::juce_isRunningInWine() && filename[0] == '/') + if (juce::File("Z:\\usr\\").existsAsFolder() && filename[0] == '/') { jfilename.replace("/", "\\"); jfilename = "Z:" + jfilename; diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp index f967134eb..ebfc3e678 100644 --- a/source/discovery/carla-discovery.cpp +++ b/source/discovery/carla-discovery.cpp @@ -1336,10 +1336,6 @@ static void do_vst_check(lib_t& libHandle, const char* const filename, const boo #endif // ! USE_JUCE_PROCESSORS #ifdef USE_JUCE_PROCESSORS -namespace juce { -extern bool juce_isRunningInWine(); -} - static void do_juce_check(const char* const filename_, const char* const stype, const bool doInit) { CARLA_SAFE_ASSERT_RETURN(stype != nullptr && stype[0] != 0,) // FIXME @@ -1349,7 +1345,7 @@ static void do_juce_check(const char* const filename_, const char* const stype, #ifdef CARLA_OS_WIN // Fix for wine usage - if (juce::juce_isRunningInWine() && filename_[0] == '/') + if (juce::File("Z:\\usr\\").existsAsFolder() && filename_[0] == '/') { filename = filename_; filename.replace("/", "\\");