Merge branch 'master' of falktxgh:falkTX/Carla

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();

source/backend/plugin/CarlaPluginVST2.cpp

@@ -1861,10 +1861,9 @@ protected:
             }
 
             // plugins should never do this:
-            CARLA_SAFE_ASSERT_INT2(index >= 0 && index < static_cast<int32_t>(pData->param.count), index, pData->param.count);
-
-            if (index < 0 || index >= static_cast<int32_t>(pData->param.count))
-                break;
+            CARLA_SAFE_ASSERT_INT2_BREAK(index >= 0 && index < static_cast<int32_t>(pData->param.count),
+                                         index,
+                                         static_cast<int32_t>(pData->param.count));
 
             const uint32_t uindex(static_cast<uint32_t>(index));
             const float fixedValue(pData->param.getFixedValue(uindex, opt));

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=", "")