remove segfault

diff --git a/Makefile b/Makefile
index 1697d809adbd3d767531b612c6ee249639cbbe81..eab35e154248a6522bbf974a23452b4789365734 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC     =       gcc
-CFLAGS =       -std=gnu11 -Wall -O2
+CFLAGS =       -std=gnu11 -Wall -g
 LDFLAGS        =       -lpthread -lao -lmpg123 -lwiringPi
 fakeradio : mp3player.o main.o
        $(CC) $(CFLAGS) -o fakeradio main.o mp3player.o $(LDFLAGS)

diff --git a/simple_try.c b/simple_try.c
index 82ceafb0eb9e21aad379418bba596ca221dcc1a1..d0ca30850052d247fa03bcba00e7e137a9b24c46 100644 (file)
--- a/simple_try.c
+++ b/simple_try.c
@@ -69,6 +69,7 @@ void introBtn(void) {
     if (delaying || pwrOn) return;
     pthread_mutex_lock(mut);
     intro = !intro;
+    horn = false;
     pthread_mutex_unlock(mut);
     pthread_cond_signal(wakeup);
 }
@@ -77,6 +78,7 @@ void hornBtn(void) {
     if (delaying || pwrOn) return;
     pthread_mutex_lock(mut);
     horn = !horn;
+    intro = false;
     pthread_mutex_unlock(mut);
     pthread_cond_signal(wakeup);
 }
@@ -125,6 +127,7 @@ int main(void) {
         delaying = true;
         if (playThread) {
             pthread_cancel(playThread);
+            pthread_join(playThread, NULL);
         }
         
         if (!pwrOn) {
@@ -135,10 +138,8 @@ int main(void) {
             if (intro) {
                 playThread = startPlayThread("intro.mp3", true);
                 digitalWrite(INTROLED, LOW);
-                horn = false;
             } else if (horn) {
                 playThread = startPlayThread("nebelhorn.mp3", true);
-                intro = false;
                 digitalWrite(INTROLED, HIGH);
             } else {
                 digitalWrite(INTROLED, HIGH);