From 7704dc0d79d1916bf59b8facfac8e0b39743556a Mon Sep 17 00:00:00 2001
From: Natt Akuma <akumanatt925@gmail.com>
Date: Mon, 7 Mar 2022 23:49:52 +0700
Subject: [PATCH] Fix volume calculation sometimes not working

---
 src/engine/platform/swan.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/engine/platform/swan.cpp b/src/engine/platform/swan.cpp
index 962fbbd1e..e7cefc464 100644
--- a/src/engine/platform/swan.cpp
+++ b/src/engine/platform/swan.cpp
@@ -152,7 +152,7 @@ void DivPlatformSwan::tick() {
   unsigned char sndCtrl=(pcm?0x20:0)|(sweep?0x40:0)|((noise>0)?0x80:0);
   for (int i=0; i<4; i++) {
     chan[i].std.next();
-    if (chan[i].std.hadVol) {
+    if (chan[i].std.willVol) {
       int env=chan[i].std.vol;
       if(parent->getIns(chan[i].ins)->type==DIV_INS_AMIGA) {
         env=MIN(env/4,15);
@@ -204,7 +204,7 @@ void DivPlatformSwan::tick() {
       rWrite(i*2,rVal&0xff);
       rWrite(i*2+1,rVal>>8);
       if (chan[i].keyOn) {
-        if (!chan[i].std.hasVol) {
+        if (!chan[i].std.willVol) {
           calcAndWriteOutVol(i,15);
         }
         if (chan[i].wave<0) {
@@ -320,7 +320,7 @@ int DivPlatformSwan::dispatch(DivCommand c) {
     case DIV_CMD_VOLUME:
       if (chan[c.chan].vol!=c.value) {
         chan[c.chan].vol=c.value;
-        if (!chan[c.chan].std.hasVol) {
+        if (!chan[c.chan].std.willVol) {
           calcAndWriteOutVol(c.chan,15);
         }
       }
@@ -392,7 +392,7 @@ int DivPlatformSwan::dispatch(DivCommand c) {
       break;
     case DIV_CMD_PANNING: {
       chan[c.chan].pan=c.value;
-      if (!chan[c.chan].std.hasVol) {
+      if (!chan[c.chan].std.willVol) {
         calcAndWriteOutVol(c.chan,15);
       }
       break;