From 7f01d3f57beef546f15bd6a8e425b830a083410c Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Thu, 21 Mar 2024 20:45:15 -0400
Subject: [PATCH] Add checks to initial title data load to prevent softlocks

---
 src/phases.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/phases.ts b/src/phases.ts
index ef15b52c89a..3a5c11540c7 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -151,15 +151,18 @@ export class TitlePhase extends Phase {
         this.scene.arenaBg.setTexture(bgTexture);
       }
       this.showOptions();
+    }).catch(err => {
+      console.error(err);
+      this.showOptions();
     });
   }
 
   showOptions(): void {
     const options: OptionSelectItem[] = [];
-    if (this.lastSessionData) {
+    if (loggedInUser.lastSessionSlot > -1) {
       options.push({
         label: 'Continue',
-        handler: () => this.loadSaveSlot(-1)
+        handler: () => this.loadSaveSlot(this.lastSessionData ? -1 : loggedInUser.lastSessionSlot)
       });
     }
     options.push({