From eb4cc768c79ec46da1b51c26d1609ea520c07d7e Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Mon, 24 Jun 2024 03:14:15 -0500
Subject: [PATCH] S3M import: fix crash when two subsong seps presen

---
 src/engine/fileOps/s3m.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/engine/fileOps/s3m.cpp b/src/engine/fileOps/s3m.cpp
index 07b693ca4..c615b3872 100644
--- a/src/engine/fileOps/s3m.cpp
+++ b/src/engine/fileOps/s3m.cpp
@@ -190,6 +190,7 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
     logD("reading orders...");
     size_t curSubSong=0;
     ds.subsong[curSubSong]->ordersLen=0;
+    bool subSongIncreased=false;
     for (int i=0; i<ordersLen; i++) {
       unsigned char nextOrder=reader.readC();
       orders[i]=curOrder;
@@ -202,10 +203,14 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
       // next subsong
       if (nextOrder==255) {
         logV("- end of song");
-        curSubSong++;
+        if (!subSongIncreased) {
+          curSubSong++;
+          subSongIncreased=true;
+        }
         curOrder=0;
         continue;
       }
+      subSongIncreased=false;
       if (ds.subsong.size()<=curSubSong) {
         ds.subsong.push_back(new DivSubSong);
         ds.subsong[curSubSong]->ordersLen=0;
@@ -264,8 +269,9 @@ bool DivEngine::loadS3M(unsigned char* file, size_t len) {
     ds.systemName="PC";
     if (hasPCM) {
       ds.system[ds.systemLen]=DIV_SYSTEM_ES5506;
-      ds.systemVol[ds.systemLen]=(float)globalVol/256.0;
+      ds.systemVol[ds.systemLen]=(float)globalVol/64.0;
       ds.systemPan[ds.systemLen]=0;
+      ds.systemFlags[ds.systemLen].set("volScale",3900);
       ds.systemFlags[ds.systemLen].set("amigaVol",true);
       ds.systemFlags[ds.systemLen].set("amigaPitch",true);
       ds.systemLen++;