curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-13 08:04:03 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update VMEmuExecutable.kt

Browse Source
This commit is contained in:
CuriousTorvald
2022-12-12 20:01:08 +09:00
committed by GitHub
parent 6fedbef541
commit e605f9ddc8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tsvm_executable/src/net/torvald/tsvm/VMEmuExecutable.kt
View File

@@ -96,7 +96,7 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
private val currentlyLoadedProfiles = HashMap<String, VM>() private val currentlyLoadedProfiles = HashMap<String, VM>()
fun getVMbyProfileName(name: String): VM? { fun getVMbyProfileName(name: String): VM? {
if (profiles.containsKey(name)) { if (profiles.containsKey(name)) {
return currentlyLoadedProfiles.getOrPut(name) { _makeVMfromJson(profiles[name]!!) } return currentlyLoadedProfiles.getOrPut(name) { _makeVMfromJson(profiles[name]!!, name) }
} }
else else
return null return null
@@ -464,7 +464,9 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
* } * }
* ``` * ```
*/ */
private fun _makeVMfromJson(json: JsonValue): VM { private fun _makeVMfromJson(json: JsonValue, profileName: String): VM {
println("Processing profile '$profileName'")
val assetsDir = json.getString("assetsdir") val assetsDir = json.getString("assetsdir")
val ramsize = json.getLong("ramsize") val ramsize = json.getLong("ramsize")
val cardslots = json.getInt("cardslots") val cardslots = json.getInt("cardslots")
@@ -507,7 +509,7 @@ class VMEmuExecutable(val windowWidth: Int, val windowHeight: Int, var panelsX:
} }
} }
if (!successful) { if (!successful) {
throw RuntimeException("Invalid or insufficient arguments for ${className}") throw RuntimeException("Invalid or insufficient arguments for $className in the profile $profileName")
} }
} }