summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-19 03:04:29 +0200
committerJack Humbert <jack.humb@gmail.com>2016-04-19 03:04:29 +0200
commit78b3a88154914591d2c3433b123d4b80e70f511d (patch)
treecfbbdf10c9008269c86f0756623a99e71ff085bf /quantum
parente49712b5593b887c8af18aeb7196513f1c7b7bcf (diff)
parentf2c1e9ddd40573f4b44ffc2ec7df1fb76346f627 (diff)
downloadqmk_firmware-78b3a88154914591d2c3433b123d4b80e70f511d.tar.gz
qmk_firmware-78b3a88154914591d2c3433b123d4b80e70f511d.tar.xz
merging in #262
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/quantum/audio.c b/quantum/audio.c
index 6a5d43013..d8768f160 100644
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@ -361,6 +361,7 @@ void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest)
if (audio_config.enable) {
+ // Cancel note if a note is playing
if (note)
stop_all_notes();
notes = true;
@@ -416,6 +417,7 @@ void play_note(double freq, int vol) {
if (audio_config.enable && voices < 8) {
+ // Cancel notes if notes are playing
if (notes)
stop_all_notes();
note = true;