diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h index f297921dc..c0cfd84e9 100644 --- a/source/includes/CarlaDefines.h +++ b/source/includes/CarlaDefines.h @@ -88,7 +88,7 @@ #if defined(CARLA_OS_WIN64) # define P_INT64 "%I64i" # define P_UINT64 "%I64u" -# define P_INTPTR "%I64i" +# define P_INTPTR "%lli" # define P_UINTPTR "%llx" # define P_SIZE "%I64u" #elif defined(CARLA_OS_WIN32) diff --git a/source/jackbridge/JackBridge2.cpp b/source/jackbridge/JackBridge2.cpp index d169286c4..776ff556a 100644 --- a/source/jackbridge/JackBridge2.cpp +++ b/source/jackbridge/JackBridge2.cpp @@ -59,7 +59,16 @@ bool jackbridge_sem_timedwait(void* sem, uint secs) noexcept #ifdef JACKBRIDGE_DUMMY return false; #else - return carla_sem_timedwait((sem_t*)sem, secs); + if (carla_sem_timedwait((sem_t*)sem, secs)) + return true; + /* + * As a sspecial case we ignore timeouts for plugin bridges. + * Some big Windows plugins (Kontakt, FL Studio VST) can time out when initializing. + * If any other error happens the plugin bridge is stopped. + */ + if (errno == ETIMEDOUT) + return true; + return false; #endif }