From e53aa7e98d0b35537c32274e67a9b2bc9cbe7437 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 22 Jan 2023 16:58:04 +0900
Subject: [PATCH] debug menu improvements

---
 .../src/net/torvald/tsvm/AudioMenu.kt         |  4 +++-
 .../src/net/torvald/tsvm/MMUMenu.kt           | 22 +++++++++----------
 .../src/net/torvald/tsvm/VMEmuExecutable.kt   |  6 +++++
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/tsvm_executable/src/net/torvald/tsvm/AudioMenu.kt b/tsvm_executable/src/net/torvald/tsvm/AudioMenu.kt
index 4be253b..9c61e3f 100644
--- a/tsvm_executable/src/net/torvald/tsvm/AudioMenu.kt
+++ b/tsvm_executable/src/net/torvald/tsvm/AudioMenu.kt
@@ -33,8 +33,10 @@ class AudioMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : EmuMe
     private val COL_SOUNDSCOPE_FORE = Color(0x80f782ff.toInt())
     private val STR_PLAY = "\u00D2\u00D3"
 
+
     override fun render(batch: SpriteBatch) {
-        val adev = parent.getCurrentlySelectedVM()?.vm?.peripheralTable?.getOrNull(cardIndex ?: -1)?.peripheral as? AudioAdapter
+
+        val adev = parent.currentlyPersistentVM?.vm?.peripheralTable?.getOrNull(cardIndex ?: -1)?.peripheral as? AudioAdapter
 
         if (adev != null) {
             batch.inUse {
diff --git a/tsvm_executable/src/net/torvald/tsvm/MMUMenu.kt b/tsvm_executable/src/net/torvald/tsvm/MMUMenu.kt
index b902cfe..9f98bf6 100644
--- a/tsvm_executable/src/net/torvald/tsvm/MMUMenu.kt
+++ b/tsvm_executable/src/net/torvald/tsvm/MMUMenu.kt
@@ -24,27 +24,27 @@ class MMUMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : EmuMenu
     override fun update() {
     }
 
-    private var vmInfo: VMEmuExecutable.VMRunnerInfo? = null // to remember previous selection as `parent.getCurrentlySelectedVM()` will return null when MMU menu is clicked
 
     override fun render(batch: SpriteBatch) {
         batch.color = Color.WHITE
 
-        vmInfo = parent.getCurrentlySelectedVM() ?: vmInfo
+        parent.currentlyPersistentVM.let { vmInfo ->
 
-        if (vmInfo == null) {
-            batch.inUse {
-                FONT.draw(batch, "Please select a VM", 12f, 11f + 0* FONT.H)
+            if (vmInfo == null) {
+                batch.inUse {
+                    FONT.draw(batch, "Please select a VM", 12f, 11f + 0* FONT.H)
+                }
             }
-        }
-        else vmInfo!!.let { (vm, vmName) ->
-            batch.inUse {
-                FONT.draw(batch, "Allocated size: ${vm.allocatedBlockCount * vm.MALLOC_UNIT}", 12f, 11f + 0* FONT.H)
+            else vmInfo.let { (vm, vmName) ->
+                batch.inUse {
+                    FONT.draw(batch, "Allocated size: ${vm.allocatedBlockCount * vm.MALLOC_UNIT}", 12f, 11f + 0* FONT.H)
 
 
 
+                }
+
+                drawAllocMap(batch, vm, 62f, 2f * FONT.H)
             }
-
-            drawAllocMap(batch, vm, 62f, 2f * FONT.H)
         }
     }
 
diff --git a/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt b/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt
index 80854c9..74d45cf 100644
--- a/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt
+++ b/tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt
@@ -122,6 +122,12 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
     }
 
     internal fun getCurrentlySelectedVM(): VMRunnerInfo? = if (currentVMselection == null) null else vms[currentVMselection!!]
+    internal var currentlyPersistentVM: VMRunnerInfo? = null
+        get() {
+            if (currentVMselection != null) { field = vms[currentVMselection!!] }
+            return field
+        }
+        private set
 
     private fun writeProfilesToFile(outFile: FileHandle) {
         val out = StringBuilder()