From: Jack Humbert <jack.humb@gmail.com>
Date: Mon, 18 Apr 2016 01:15:50 +0000 (-0400)
Subject: Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5a15c113d7458bf3bea6904e3c607898e961164c;p=qmk_firmware.git

Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware
---

5a15c113d7458bf3bea6904e3c607898e961164c
diff --cc quantum/audio.c
index e0413051a,602366973..5805da46c
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@@ -351,9 -351,8 +351,9 @@@ void play_notes(float (*np)[][2], uint8
  
  if (audio_config.enable) {
  
-     if (note)
+     if (note || notes)
          stop_all_notes();
 +    notes = true;
  
      notes_pointer = np;
      notes_count = n_count;
@@@ -406,9 -406,8 +406,9 @@@ void play_note(double freq, int vol) 
  
  if (audio_config.enable && voices < 8) {
  
-     if (notes)
+     if (note || notes)
          stop_all_notes();
 +    note = true;
      #ifdef PWM_AUDIO
          freq = freq / SAMPLE_RATE;
      #endif