AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 01:48:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

profile loader: properly crash when error occurs

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-25 16:19:30 +01:00
parent 0cfb65b0c9
commit 749936ec7b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/bixilon/minosoft/config/profile/manager/ProfileManagers.kt
View File

@ -33,6 +33,7 @@ import de.bixilon.minosoft.config.profile.profiles.resources.ResourcesProfileMan
import de.bixilon.minosoft.config.profile.storage.ProfileIOManager import de.bixilon.minosoft.config.profile.storage.ProfileIOManager
import de.bixilon.minosoft.config.profile.storage.StorageProfileManager import de.bixilon.minosoft.config.profile.storage.StorageProfileManager
import de.bixilon.minosoft.data.registries.factory.DefaultFactory import de.bixilon.minosoft.data.registries.factory.DefaultFactory
import de.bixilon.minosoft.gui.eros.crash.ErosCrashReport.Companion.crash
import de.bixilon.minosoft.terminal.RunConfiguration import de.bixilon.minosoft.terminal.RunConfiguration
import java.nio.file.Files import java.nio.file.Files
@ -77,10 +78,22 @@ object ProfileManagers : DefaultFactory<StorageProfileManager<*>>(
FileWatcherService.start() // TODO: kutil 1.25: remove kutil race condition FileWatcherService.start() // TODO: kutil 1.25: remove kutil race condition
} }
val worker = UnconditionalWorker() val worker = UnconditionalWorker()
var first: Throwable? = null
for (manager in ProfileManagers) { for (manager in ProfileManagers) {
worker += { manager.load() } worker += {
try {
manager.load()
} catch (error: Throwable) {
error.printStackTrace()
if (first == null) {
first = error
}
}
}
} }
worker.work(latch) worker.work(latch)
first?.let { it.crash(); throw it }
ProfileIOManager.init() ProfileIOManager.init()
// runLater(5000) { // runLater(5000) {