From: IBNobody <ibnobody@gmail.com>
Date: Mon, 18 Apr 2016 04:16:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_p... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=82ec81660e9816b72bc0d661becc399c62594970;p=qmk_firmware.git

Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck
---

82ec81660e9816b72bc0d661becc399c62594970
diff --cc quantum/audio.c
index ba85e418e,e0413051a..627e3d80a
--- a/quantum/audio.c
+++ b/quantum/audio.c
@@@ -351,9 -351,9 +351,10 @@@ void play_notes(float (*np)[][2], uint8
  
  if (audio_config.enable) {
  
 +	// Cancel note if a note is playing
      if (note)
          stop_all_notes();
+     notes = true;
  
      notes_pointer = np;
      notes_count = n_count;
@@@ -407,9 -406,9 +407,10 @@@ 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;
      #ifdef PWM_AUDIO
          freq = freq / SAMPLE_RATE;
      #endif