From: TheRaspyDev <theraspydev@gmail.com>
Date: Fri, 19 May 2017 08:14:06 +0000 (+0200)
Subject: Resolve merge conflict
X-Git-Tag: archive/raspbian/1.68-2+rpi1~58^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=32727085fc7fe8c8e0d546201aa317f86efe7e59;p=pigpio.git

Resolve merge conflict
---

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))
    {