From 68498ec7baff16f6004dd6e72e0a2e210d291a98 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 28 Jan 2021 14:59:16 +0200
Subject: [PATCH] "Save game" errors are now correctly caught and displayed to
 the user

---
 core/src/com/unciv/logic/GameSaver.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/GameSaver.kt b/core/src/com/unciv/logic/GameSaver.kt
index 5eb300c3a9..06249c13b0 100644
--- a/core/src/com/unciv/logic/GameSaver.kt
+++ b/core/src/com/unciv/logic/GameSaver.kt
@@ -45,8 +45,12 @@ object GameSaver {
         if (customSaveLocation != null && customSaveLocationHelper != null) {
             customSaveLocationHelper.saveGame(game, GameName, forcePrompt, saveCompletionCallback)
         } else {
-            json().toJson(game, getSave(GameName, multiplayer))
-            saveCompletionCallback?.invoke(null)
+            try {
+                json().toJson(game, getSave(GameName, multiplayer))
+                saveCompletionCallback?.invoke(null)
+            } catch (ex: Exception) {
+                saveCompletionCallback?.invoke(ex)
+            }
         }
     }