]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Fix Audio code when resetting keyboard
authorDrashna Jaelre <drashna@live.com>
Mon, 30 Jul 2018 04:24:42 +0000 (21:24 -0700)
committerJack Humbert <jack.humb@gmail.com>
Sat, 4 Aug 2018 20:49:57 +0000 (16:49 -0400)
I incorrectly disabled a bunch of code that shouldn't have been disabled.  This should only disable music mode stuff, not general audio.

quantum/quantum.c

index 9c6ed3330e5a068134ea428df41161782d4359ce..aad678e1ad47087906f862495af210365854b791 100644 (file)
@@ -147,8 +147,10 @@ void reset_keyboard(void) {
 #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
   process_midi_all_notes_off();
 #endif
-#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
-  music_all_notes_off();
+#ifdef AUDIO_ENABLE
+  #ifndef NO_MUSIC_MODE
+    music_all_notes_off();
+  #endif
   uint16_t timer_start = timer_read();
   PLAY_SONG(goodbye_song);
   shutdown_user();
@@ -931,7 +933,7 @@ uint8_t rgb_matrix_task_counter = 0;
 #endif
 
 void matrix_scan_quantum() {
-  #if defined(AUDIO_ENABLE)
+  #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
     matrix_scan_music();
   #endif