From 0ab167491baba1a5d6ec0baf3528a2212cbe8c5a Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 2 Mar 2019 09:13:25 +0100 Subject: [PATCH] Fix a typo, better debugging Signed-off-by: falkTX --- source/backend/plugin/CarlaPluginInternal.cpp | 2 +- source/backend/plugin/CarlaPluginVST2.cpp | 7 +++---- source/frontend/carla_shared.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/backend/plugin/CarlaPluginInternal.cpp b/source/backend/plugin/CarlaPluginInternal.cpp index 6da6fc586..e0f3534fb 100644 --- a/source/backend/plugin/CarlaPluginInternal.cpp +++ b/source/backend/plugin/CarlaPluginInternal.cpp @@ -520,7 +520,7 @@ CarlaPlugin::ProtectedData::PostRtEvents::~PostRtEvents() noexcept void CarlaPlugin::ProtectedData::PostRtEvents::appendRT(const PluginPostRtEvent& e) noexcept { - CARLA_SAFE_ASSERT_RETURN(dataPendingMutex.tryLock(),); + CARLA_SAFE_ASSERT_INT2_RETURN(dataPendingMutex.tryLock(), e.type, e.value1,); dataPendingRT.append(e); dataPendingMutex.unlock(); diff --git a/source/backend/plugin/CarlaPluginVST2.cpp b/source/backend/plugin/CarlaPluginVST2.cpp index 1565bfe4e..5bbebb0d9 100644 --- a/source/backend/plugin/CarlaPluginVST2.cpp +++ b/source/backend/plugin/CarlaPluginVST2.cpp @@ -1861,10 +1861,9 @@ protected: } // plugins should never do this: - CARLA_SAFE_ASSERT_INT2(index >= 0 && index < static_cast(pData->param.count), index, pData->param.count); - - if (index < 0 || index >= static_cast(pData->param.count)) - break; + CARLA_SAFE_ASSERT_INT2_BREAK(index >= 0 && index < static_cast(pData->param.count), + index, + static_cast(pData->param.count)); const uint32_t uindex(static_cast(index)); const float fixedValue(pData->param.getFixedValue(uindex, opt)); diff --git a/source/frontend/carla_shared.py b/source/frontend/carla_shared.py index c3bf1a32f..9af211184 100644 --- a/source/frontend/carla_shared.py +++ b/source/frontend/carla_shared.py @@ -562,7 +562,7 @@ def handleInitialCommandLineArguments(file): for arg in sys.argv[1:]: if arg.startswith("--with-appname="): - initName = os.path.basename(arg.replace("--with-initname=", "")) + initName = os.path.basename(arg.replace("--with-appname=", "")) elif arg.startswith("--with-libprefix="): libPrefix = arg.replace("--with-libprefix=", "")