synchronized upon merging

diff --git a/actions.c b/actions.c
index 0f8c34b8850e8e1847cf12dbb9dc11ceee0d5f62..37d7b31a91ec20fcd55edc9834ac8177aebfceda 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -980,11 +980,11 @@ int process_action(void *data) {
       break;
     case SAT:
       if(a->mode==PRESSED) {
-       if(sat_mode==SAT_MODE) {
-         sat_mode=SAT_NONE;
-        } else {
-         sat_mode=SAT_MODE;
-        }
+       if(sat_mode==SAT_MODE) {
+         sat_mode=SAT_NONE;
+       } else {
+         sat_mode=SAT_MODE;
+       }
         g_idle_add(ext_vfo_update, NULL);
       }
       break;

diff --git a/audio.h b/audio.h
index 5f6832df105351ef2dcaac6f7cd230d9e6cc2533..13eca07ad9829ea865e267d8bd24a526558d3bd4 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -42,7 +42,7 @@ extern void audio_close_input();
 extern int audio_open_output(RECEIVER *rx);
 extern void audio_close_output(RECEIVER *rx);
 extern int audio_write(RECEIVER *rx,float left_sample,float right_sample);
-extern int cw_audio_write(RECEIVER *rx, float sample);
+extern int cw_audio_write(RECEIVER *rx,float sample);
 extern void audio_get_cards();
 char * audio_get_error_string(int err);
 float  audio_get_next_mic_sample();