Multiplayer screen correctly handles errors when downloading mods

yairm210 · Jan 21, 2025 · 2f79658 · 2f79658
1 parent 159f2e5
commit 2f79658
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt b/core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerScreen.kt
@@ -81,13 +81,18 @@ class MultiplayerScreen : PickerScreen() {
 
             // Download missing mods
             Concurrency.runOnNonDaemonThreadPool(LoadGameScreen.downloadMissingMods) {
-                LoadGameScreen.loadMissingMods(missingMods, onModDownloaded = {
-                    Concurrency.runOnGLThread { ToastPopup("[$it] Downloaded!", this@MultiplayerScreen) }
-                },
-                onCompleted = {
-                    RulesetCache.loadRulesets()
-                    Concurrency.runOnGLThread { MultiplayerHelpers.loadMultiplayerGame(this@MultiplayerScreen, selectedGame!!) }
-                })
+                try {
+                    LoadGameScreen.loadMissingMods(missingMods, onModDownloaded = {
+                        Concurrency.runOnGLThread { ToastPopup("[$it] Downloaded!", this@MultiplayerScreen) }
+                    },
+                    onCompleted = {
+                        RulesetCache.loadRulesets()
+                        Concurrency.runOnGLThread { MultiplayerHelpers.loadMultiplayerGame(this@MultiplayerScreen, selectedGame!!) }
+                    })
+                } catch (ex: Exception) {
+                    val (message) = LoadGameScreen.getLoadExceptionMessage(ex)
+                    launchOnGLThread { ToastPopup(message, this@MultiplayerScreen) }
+                }
             }
         }
     }