From e777c6678652e83af536e1edc2657586bbec7f47 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 10 Apr 2021 15:29:39 +0100 Subject: [PATCH] Fix cancelling plugin discovery Closes #1391 Signed-off-by: falkTX --- source/frontend/carla_database.py | 3 +-- source/utils/RtLinkedList.hpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/frontend/carla_database.py b/source/frontend/carla_database.py index 901def7f5..de47181e8 100755 --- a/source/frontend/carla_database.py +++ b/source/frontend/carla_database.py @@ -317,10 +317,9 @@ def runCarlaDiscovery(itype, stype, filename, tool, wineSettings=None): else: print("%s - %s (unknown property)" % (line, filename)) - # FIXME? tmp = gDiscoveryProcess gDiscoveryProcess = None - del gDiscoveryProcess, tmp + del tmp return plugins diff --git a/source/utils/RtLinkedList.hpp b/source/utils/RtLinkedList.hpp index 07cda5903..fc7322429 100644 --- a/source/utils/RtLinkedList.hpp +++ b/source/utils/RtLinkedList.hpp @@ -21,7 +21,8 @@ #include "LinkedList.hpp" extern "C" { -#include "rtmempool/rtmempool.h" +/* full path as IDE Helper */ +#include "../modules/rtmempool/rtmempool.h" } // -----------------------------------------------------------------------