From 21e0f984beb1bc8daade2f84db0dd598675977ad Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 26 Nov 2023 22:28:17 +0900
Subject: [PATCH] fix: app not quitting

---
 src/net/torvald/terrarum/App.java            |  3 ++
 src/net/torvald/terrarum/audio/AudioMixer.kt | 34 +++++++++++++-------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java
index 7c871e709..0e6c81280 100644
--- a/src/net/torvald/terrarum/App.java
+++ b/src/net/torvald/terrarum/App.java
@@ -977,6 +977,9 @@ public class App implements ApplicationListener {
             }
             catch (NullPointerException | IllegalArgumentException | GdxRuntimeException | ConcurrentModificationException e) { }
         });
+
+        // kill the zombies, no matter what
+        System.exit(0);
     }
 
     @Override
diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt
index 15bdf5ecc..b349d893a 100644
--- a/src/net/torvald/terrarum/audio/AudioMixer.kt
+++ b/src/net/torvald/terrarum/audio/AudioMixer.kt
@@ -6,6 +6,7 @@ import com.badlogic.gdx.backends.lwjgl3.audio.Lwjgl3Audio
 import com.badlogic.gdx.utils.Disposable
 import com.jme3.math.FastMath
 import net.torvald.terrarum.App
+import net.torvald.terrarum.App.printdbg
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATE
 import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATED
@@ -89,6 +90,7 @@ object AudioMixer: Disposable {
     var processing = true
 
     private val processingExecutor = ThreadExecutor()
+//    private lateinit var processingSubthreads: List<Thread>
     val processingThread = Thread {
         /*while (processing) {
             // process
@@ -109,32 +111,38 @@ object AudioMixer: Disposable {
         }*/
 
         while (processing) {
-            parallelProcessingSchedule.forEach { tracks ->
-                /*val callables = tracks.map { Callable {
+            for (tracks in parallelProcessingSchedule) {
+                if (!processing) break
+
+                val callables = tracks.map { Callable {
                     if (!it.processor.paused) {
-                        it.processor.run()
+                        try { it.processor.run() }
+                        catch (e: Throwable) { e.printStackTrace() }
                     }
                 } }
 
-                processingExecutor.renew()
-                processingExecutor.submitAll(callables)
-                processingExecutor.join()*/
+                try {
+                    processingExecutor.renew()
+                    processingExecutor.submitAll(callables)
+                    processingExecutor.join()
+                }
+                catch (_: Throwable) {}
 
 
-                val threads = tracks.map { Thread {
+                /*processingSubthreads = tracks.map { Thread {
                     if (!it.processor.paused) {
                         it.processor.run()
                     }
                 }.also { it.priority = MAX_PRIORITY } }
 
                 try {
-                    threads.forEach { it.start() }
-                    threads.forEach { it.join() }
+                    processingSubthreads.forEach { it.start() }
+                    processingSubthreads.forEach { it.join() }
                 }
-                catch (e: InterruptedException) {}
+                catch (e: InterruptedException) {}*/
             }
 
-            while (!masterTrack.pcmQueue.isEmpty) {
+            while (processing && !masterTrack.pcmQueue.isEmpty) {
                 masterTrack.adev!!.writeSamples(masterTrack.pcmQueue.removeFirst()) // it blocks until the queue is consumed
             }
         }
@@ -389,8 +397,10 @@ object AudioMixer: Disposable {
 
 
     override fun dispose() {
+        processingExecutor.killAll()
+//        processingSubthreads.forEach { it.interrupt() }
         processing = false
-        processingThread.join()
+        processingThread.interrupt()
 //        feeder.stop()
 //        feedingThread.join()
         tracks.forEach { it.tryDispose() }