From 6bc4877417f3e0050109e613ff9da51268e8370c Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 10 Jun 2023 17:34:30 -0500
Subject: [PATCH 1/3] PC speaker: fix volume macro

issue #1147
---
 src/engine/platform/pcspkr.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/engine/platform/pcspkr.cpp b/src/engine/platform/pcspkr.cpp
index 9694b66c..a275c635 100644
--- a/src/engine/platform/pcspkr.cpp
+++ b/src/engine/platform/pcspkr.cpp
@@ -366,8 +366,10 @@ void DivPlatformPCSpeaker::tick(bool sysTick) {
       chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER)-1;
       if (chan[i].freq<0) chan[i].freq=0;
       if (chan[i].freq>65535) chan[i].freq=65535;
-      if (chan[i].keyOn) {
-        on=true;
+      if (!chan[i].std.vol.had) {
+        if (chan[i].keyOn) {
+          on=true;
+        }
       }
       if (chan[i].keyOff) {
         on=false;

From 7c2803fae95753f74a3db5b2341feddf69db3bc0 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 10 Jun 2023 19:22:26 -0500
Subject: [PATCH 2/3] update doc authors

---
 doc/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/README.md b/doc/README.md
index d8a14be2..a59ce838 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -22,6 +22,7 @@ writers:
 - host12prog
 - WindowxDeveloper
 - polluks
+- Electric Keet
 
 other:
 

From 8264449c7ac8d20cd38f57c2633c8c405a585526 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 10 Jun 2023 19:22:44 -0500
Subject: [PATCH 3/3] GUI: remove double semicolon

---
 src/gui/gui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 3d8453c4..dd315ddf 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -3489,7 +3489,7 @@ bool FurnaceGUI::loop() {
             int sampleCountBefore=e->song.sampleLen;
             std::vector<DivInstrument*> instruments=e->instrumentFromFile(ev.drop.file);
             DivWavetable* droppedWave=NULL;
-            DivSample* droppedSample=NULL;;
+            DivSample* droppedSample=NULL;
             if (!instruments.empty()) {
               if (e->song.sampleLen!=sampleCountBefore) {
                 e->renderSamplesP();