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

reset update if checked for updates, show dialog after eros is up

Browse Source
This commit is contained in:
Moritz Zwerger 2023-12-22 23:40:38 +01:00
parent 6eca3a93f1
commit 99096636a8
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt
View File

@ -91,11 +91,6 @@ object Eros {
start() start()
} }
} }
MinosoftUpdater::update.observe(this, true) {
if (it == null) return@observe
if (it.id == OtherProfileManager.selected.updater.dismiss) return@observe // TODO: if not searched manually
UpdateAvailableDialog(it).show()
}
} }
private fun askForUpdates() { private fun askForUpdates() {
@ -121,6 +116,13 @@ object Eros {
mainErosController.stage.show() mainErosController.stage.show()
initialized = true initialized = true
visible = true visible = true
MinosoftUpdater::update.observe(this, true) {
if (it == null) return@observe
if (it.id == OtherProfileManager.selected.updater.dismiss) return@observe // TODO: if not searched manually
UpdateAvailableDialog(it).show()
}
askForUpdates() askForUpdates()
Log.log(LogMessageType.JAVAFX, LogLevels.VERBOSE) { "Eros up!" } Log.log(LogMessageType.JAVAFX, LogLevels.VERBOSE) { "Eros up!" }
} }

1
src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt
View File

@ -78,6 +78,7 @@ object MinosoftUpdater {
validateURL(request.toURL()) validateURL(request.toURL())
val update = request(request, error) val update = request(request, error)
this.update = null // clear first to "reprompt"
this.update = update this.update = update
return update return update
} }