From 32727085fc7fe8c8e0d546201aa317f86efe7e59 Mon Sep 17 00:00:00 2001 From: TheRaspyDev Date: Fri, 19 May 2017 10:14:06 +0200 Subject: [PATCH] Resolve merge conflict --- pigpio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pigpio.c b/pigpio.c index a4391a7..81af8af 100644 --- a/pigpio.c +++ b/pigpio.c @@ -8140,10 +8140,13 @@ int initInitialise(void) if (pthread_attr_setstacksize(&pthAttr, STACK_SIZE)) SOFT_ERROR(PI_INIT_FAILED, "pthread_attr_setstacksize failed (%m)"); - if (pthread_create(&pthAlert, &pthAttr, pthAlertThread, &i)) - SOFT_ERROR(PI_INIT_FAILED, "pthread_create alert failed (%m)"); + if (!(gpioCfg.ifFlags & PI_DISABLE_ALERT)) + { + if (pthread_create(&pthAlert, &pthAttr, pthAlertThread, &i)) + SOFT_ERROR(PI_INIT_FAILED, "pthread_create alert failed (%m)"); - pthAlertRunning = PI_THREAD_STARTED; + pthAlertRunning = PI_THREAD_STARTED; + } if (!(gpioCfg.ifFlags & PI_DISABLE_FIFO_IF)) { -- 2.30.2