Browse Source

Handle wine pickyness for filenames, fixes #329

As stupid as "//path" vs "/path".
Even though the 1st option is perfectly valid path on Linux.

Somehow the issue only manifests itself under bitwig.
tags/1.9.7
falkTX 8 years ago
parent
commit
c94a0c80f2
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      source/backend/plugin/CarlaPluginBridge.cpp

+ 7
- 1
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -2673,7 +2673,7 @@ CARLA_BACKEND_END_NAMESPACE

CARLA_BACKEND_START_NAMESPACE

CarlaPlugin* CarlaPlugin::newBridge(const Initializer& init, BinaryType btype, PluginType ptype, const char* const bridgeBinary)
CarlaPlugin* CarlaPlugin::newBridge(const Initializer& init, BinaryType btype, PluginType ptype, const char* bridgeBinary)
{
carla_debug("CarlaPlugin::newBridge({%p, \"%s\", \"%s\", \"%s\"}, %s, %s, \"%s\")", init.engine, init.filename, init.name, init.label, BinaryType2Str(btype), PluginType2Str(ptype), bridgeBinary);

@@ -2683,6 +2683,12 @@ CarlaPlugin* CarlaPlugin::newBridge(const Initializer& init, BinaryType btype, P
return nullptr;
}

#ifndef CARLA_OS_WIN
// FIXME: somewhere, somehow, we end up with double slashes, wine doesn't like that.
if (std::strncmp(bridgeBinary, "//", 2) == 0)
++bridgeBinary;
#endif

CarlaPluginBridge* const plugin(new CarlaPluginBridge(init.engine, init.id, btype, ptype));

if (! plugin->init(init.filename, init.name, init.label, init.uniqueId, bridgeBinary))


Loading…
Cancel
Save