2 files changed, 7 insertions, 6 deletions

diff --git a/quantum/audio.c b/quantum/audio.c
index 90f3c5a13..6bd6532a3 100644
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@ -350,7 +350,6 @@ if (audio_config.enable) {
 
     if (note)
         stop_all_notes();
-    notes = true;
 
     notes_pointer = np;
     notes_length = n_length;
@@ -375,6 +374,8 @@ if (audio_config.enable) {
         TIMSK3 |= _BV(OCIE3A);
         TCCR3A |= _BV(COM3A1);
     #endif
+
+    notes = true;
 }
 
 }
@@ -404,7 +405,6 @@ if (audio_config.enable && voices < 8) {
 
     if (notes)
         stop_all_notes();
-    note = true;
     #ifdef PWM_AUDIO
         freq = freq / SAMPLE_RATE;
     #endif
@@ -436,6 +436,7 @@ if (audio_config.enable && voices < 8) {
         TCCR3A |= _BV(COM3A1);
     #endif
 
+    note = true;
 }
 
 }
\ No newline at end of file
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 02d3c74be..d38e6fdb2 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -33,14 +33,14 @@ extern keymap_config_t keymap_config;
 #include <inttypes.h>
 #ifdef AUDIO_ENABLE
     #include "audio.h"
-    #ifndef GOODBYE_TUNE
-    #define GOODBYE_TUNE { \
+    #ifndef TONE_GOODBYE
+    #define TONE_GOODBYE { \
         {440.0*pow(2.0,(31)/12.0), 8}, \
         {440.0*pow(2.0,(24)/12.0), 8}, \
         {440.0*pow(2.0,(19)/12.0), 12}, \
     } 
     #endif
-    float goodbye_tune[][2] = GOODBYE_TUNE;
+    float tone_goodbye[][2] = TONE_GOODBYE;
 #endif
 
 static action_t keycode_to_action(uint16_t keycode);
@@ -191,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode)
         case RESET: ; // RESET is 0x5000, which is why this is here
             clear_keyboard();
             #ifdef AUDIO_ENABLE
-                PLAY_NOTE_ARRAY(goodbye_tune, false, 0);
+                PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
             #endif
             _delay_ms(250);
             #ifdef ATREUS_ASTAR