]> git.rkrishnan.org Git - pihpsdr.git/commitdiff
fixed race condition when enabling local audio from menu
authorJohn Melton - G0ORX/N6LYT <john.d.melton@googlemail.com>
Wed, 13 Jul 2016 14:15:38 +0000 (14:15 +0000)
committerJohn Melton - G0ORX/N6LYT <john.d.melton@googlemail.com>
Wed, 13 Jul 2016 14:15:38 +0000 (14:15 +0000)
menu.c
pihpsdr
release/pihpsdr.tar
release/pihpsdr/pihpsdr

diff --git a/menu.c b/menu.c
index caf40821d184fc4f37cd30fdaca119f3b359a408..7536cc4b7c5378ee6f3ffb516ccb553a1d5884c2 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -131,14 +131,13 @@ static void micboost_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void local_audio_cb(GtkWidget *widget, gpointer data) {
-  local_audio=local_audio==1?0:1;
   if(local_audio) {
-    if(audio_init()!=0) {
-      fprintf(stderr,"audio_init failed\n");
-      local_audio=0;
-    }
-  } else {
+    local_audio=0;
     audio_close();
+  } else {
+    if(audio_init()==0) {
+      local_audio=1;
+    }
   }
 }
 
diff --git a/pihpsdr b/pihpsdr
index 3d72ae35d77ee2726b1470b5a47de314cdc5626b..5c968edde472335d6b3b12fc4031d458d4552a2e 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ
index e37f3161406cf7e310f514cff1c7c0da14cef3bd..1b8a29572b5b3b328d77a514f4312eeca5fde547 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ
index 28029f40b4a125f3a5265174d6648ccafbc17b5d..5c968edde472335d6b3b12fc4031d458d4552a2e 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ