Browse Source

Replace wine function check for Z:\usr\ folder check

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
0f9dc2c9f1
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 2 additions and 10 deletions
  1. +1
    -5
      source/backend/plugin/CarlaPluginJuce.cpp
  2. +1
    -5
      source/discovery/carla-discovery.cpp

+ 1
- 5
source/backend/plugin/CarlaPluginJuce.cpp View File

@@ -50,10 +50,6 @@


#include "JucePluginWindow.hpp" #include "JucePluginWindow.hpp"


namespace juce {
extern bool juce_isRunningInWine();
}

CARLA_BACKEND_START_NAMESPACE CARLA_BACKEND_START_NAMESPACE


// ------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------
@@ -1304,7 +1300,7 @@ public:


#ifdef CARLA_OS_WIN #ifdef CARLA_OS_WIN
// Fix for wine usage // Fix for wine usage
if (juce::juce_isRunningInWine() && filename[0] == '/')
if (juce::File("Z:\\usr\\").existsAsFolder() && filename[0] == '/')
{ {
jfilename.replace("/", "\\"); jfilename.replace("/", "\\");
jfilename = "Z:" + jfilename; jfilename = "Z:" + jfilename;


+ 1
- 5
source/discovery/carla-discovery.cpp View File

@@ -1336,10 +1336,6 @@ static void do_vst_check(lib_t& libHandle, const char* const filename, const boo
#endif // ! USE_JUCE_PROCESSORS #endif // ! USE_JUCE_PROCESSORS


#ifdef 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) 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 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 #ifdef CARLA_OS_WIN
// Fix for wine usage // Fix for wine usage
if (juce::juce_isRunningInWine() && filename_[0] == '/')
if (juce::File("Z:\\usr\\").existsAsFolder() && filename_[0] == '/')
{ {
filename = filename_; filename = filename_;
filename.replace("/", "\\"); filename.replace("/", "\\");


Loading…
Cancel
Save