Browse Source

Dont prefer UI bridges if running as bridge already

Fixes #720
tags/v1.9.11
falkTX 7 years ago
parent
commit
527e649987
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      source/backend/plugin/CarlaPluginLV2.cpp

+ 4
- 4
source/backend/plugin/CarlaPluginLV2.cpp View File

@@ -5290,7 +5290,7 @@ public:


#if defined(LV2_UIS_ONLY_BRIDGES) #if defined(LV2_UIS_ONLY_BRIDGES)
const bool preferUiBridges = true; const bool preferUiBridges = true;
#elif defined(BUILD_BRIDGE_ALTERNATIVE_ARCH)
#elif defined(BUILD_BRIDGE)
const bool preferUiBridges = false; const bool preferUiBridges = false;
#else #else
const bool preferUiBridges = pData->engine->getOptions().preferUiBridges; const bool preferUiBridges = pData->engine->getOptions().preferUiBridges;
@@ -5349,7 +5349,7 @@ public:
} }
} }


if (eQt4 >= 0)
/**/ if (eQt4 >= 0)
iFinal = eQt4; iFinal = eQt4;
else if (eQt5 >= 0) else if (eQt5 >= 0)
iFinal = eQt5; iFinal = eQt5;
@@ -5386,7 +5386,7 @@ public:
else if (iExt >= 0) else if (iExt >= 0)
iFinal = iExt; iFinal = iExt;


#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
#ifndef BUILD_BRIDGE
if (iFinal < 0) if (iFinal < 0)
#endif #endif
{ {
@@ -5462,7 +5462,7 @@ public:
iFinal == eCocoa || iFinal == eCocoa ||
iFinal == eWindows || iFinal == eWindows ||
iFinal == eX11) iFinal == eX11)
#ifdef BUILD_BRIDGE_ALTERNATIVE_ARCH
#ifdef BUILD_BRIDGE
&& ! hasShowInterface && ! hasShowInterface
#endif #endif
) )


Loading…
Cancel
Save