From 99096636a8da85fccb63dda67a11f6f6c74174f7 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Fri, 22 Dec 2023 23:40:38 +0100 Subject: [PATCH] reset update if checked for updates, show dialog after eros is up --- src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt | 12 +++++++----- .../de/bixilon/minosoft/updater/MinosoftUpdater.kt | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt b/src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt index 336a3eeb5..b4216f3b2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/Eros.kt @@ -91,11 +91,6 @@ object Eros { 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() { @@ -121,6 +116,13 @@ object Eros { mainErosController.stage.show() initialized = 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() Log.log(LogMessageType.JAVAFX, LogLevels.VERBOSE) { "Eros up!" } } diff --git a/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt b/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt index e230e655d..c2f2a64b9 100644 --- a/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt +++ b/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt @@ -78,6 +78,7 @@ object MinosoftUpdater { validateURL(request.toURL()) val update = request(request, error) + this.update = null // clear first to "reprompt" this.update = update return update }