diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-07-29 21:24:42 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-08-04 16:49:57 -0400 |
| commit | ef5b161bb5ebf137bd95e4462588bb20ffbe0f79 (patch) | |
| tree | ffc894fd39b99956d1c77d1d523f740fcc23ca9a /quantum | |
| parent | 23d68d0ba12ced8b58b7e6225c3c1c5aa41a38d0 (diff) | |
| download | firmware-ef5b161bb5ebf137bd95e4462588bb20ffbe0f79.tar.gz firmware-ef5b161bb5ebf137bd95e4462588bb20ffbe0f79.tar.bz2 firmware-ef5b161bb5ebf137bd95e4462588bb20ffbe0f79.zip | |
Fix Audio code when resetting keyboard
I incorrectly disabled a bunch of code that shouldn't have been disabled. This should only disable music mode stuff, not general audio.
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 9c6ed3330..aad678e1a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -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 |