From 222e4ad4b5e5fff9edf3accf3dcf198233c52d9f Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 10 Oct 2019 09:48:05 +0300
Subject: [PATCH] Tutorial fix

---
 android/build.gradle                     |  4 ++--
 core/src/com/unciv/ui/utils/Tutorials.kt | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 349a5b7194..dfd1b80dc3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 305
-        versionName "3.1.3"
+        versionCode 306
+        versionName "3.1.4"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/ui/utils/Tutorials.kt b/core/src/com/unciv/ui/utils/Tutorials.kt
index d52499569a..3deb953d20 100644
--- a/core/src/com/unciv/ui/utils/Tutorials.kt
+++ b/core/src/com/unciv/ui/utils/Tutorials.kt
@@ -28,8 +28,14 @@ class Tutorials{
     fun displayTutorials(name: String, stage: Stage) {
         if (!UnCivGame.Current.settings.showTutorials) return
         if (UnCivGame.Current.settings.tutorialsShown.contains(name)) return
-        val texts = getTutorials(name, UnCivGame.Current.settings.language)
-        tutorialTexts.add(Tutorial(name,texts))
+
+        var texts: ArrayList<String>
+        try {
+            texts = getTutorials(name, UnCivGame.Current.settings.language)
+        } catch (ex: Exception) {
+            texts = ArrayList<String>().apply { add("Could not find matching tutorial!") }
+        }
+        tutorialTexts.add(Tutorial(name, texts))
         if (!isTutorialShowing) displayTutorial(stage)
     }