Merge remote-tracking branch 'remotes/jackhumbert/master'

1 files changed, 3 insertions, 1 deletions

diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index f06abaf7f..9edcc42a0 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -357,9 +357,11 @@ static bool command_common(uint8_t code)
             clear_keyboard(); // clear to prevent stuck keys
             print("\n\nJumping to bootloader... ");
             #ifdef AUDIO_ENABLE
+                    stop_all_notes();
                 play_goodbye_tone();
+            #else
+                    _delay_ms(1000);
             #endif
-            _delay_ms(1000);
             bootloader_jump(); // not return
             break;