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

diff --cc quantum/audio.c
index ba85e418ed655939993e8e7f08151640351c4749,e0413051a092e17e901c24aea4da553b5f0bad5b..627e3d80a17f26a062f6efce8e3f844963b5adc1
--- 1/quantum/audio.c
--- 2/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