Browse Source

Fix loading project files with unicode names; Fix vst project load

Closes #336
tags/1.9.7
falkTX 9 years ago
parent
commit
fdd84a4cf7
3 changed files with 6 additions and 7 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngine.cpp
  2. +0
    -5
      source/carla_app.py
  3. +5
    -1
      source/carla_shared.py

+ 1
- 1
source/backend/engine/CarlaEngine.cpp View File

@@ -414,7 +414,7 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype,
bool preferBridges = pData->options.preferPluginBridges; bool preferBridges = pData->options.preferPluginBridges;


# ifdef CARLA_OS_LINUX # ifdef CARLA_OS_LINUX
if (! preferBridges)
if (! preferBridges && label != nullptr)
{ {
if (ptype == PLUGIN_LV2) if (ptype == PLUGIN_LV2)
{ {


+ 0
- 5
source/carla_app.py View File

@@ -237,11 +237,6 @@ class CarlaApplication(object):


print("Using \"%s\" theme" % self.fApp.style().objectName()) print("Using \"%s\" theme" % self.fApp.style().objectName())


def arguments(self):
# FIXME - PyQt mishandles unicode characters, we'll use direct sys.argv for now
return sys.argv
return self.fApp.arguments()

def exec_(self): def exec_(self):
return self.fApp.exec_() return self.fApp.exec_()




+ 5
- 1
source/carla_shared.py View File

@@ -599,7 +599,11 @@ def handleInitialCommandLineArguments(file):
# Get initial project file (as passed in the command-line parameters) # Get initial project file (as passed in the command-line parameters)


def getInitialProjectFile(app, skipExistCheck = False): def getInitialProjectFile(app, skipExistCheck = False):
for arg in app.arguments()[1:]:
# FIXME - PyQt mishandles unicode characters, we'll use direct sys.argv for now
# see https://riverbankcomputing.com/pipermail/pyqt/2015-January/035395.html
#args = app.arguments()[1:]
args = sys.argv[1:]
for arg in args:
if arg.startswith("--with-appname=") or arg.startswith("--with-libprefix=") or arg == "--gdb": if arg.startswith("--with-appname=") or arg.startswith("--with-libprefix=") or arg == "--gdb":
continue continue
if arg in ("-n", "--n", "-no-gui", "--no-gui", "-nogui", "--nogui"): if arg in ("-n", "--n", "-no-gui", "--no-gui", "-nogui", "--nogui"):


Loading…
Cancel
Save