From ad4eddb40801de5b19dd25a5ad33b6445f787417 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Tue, 4 Feb 2025 13:01:33 +0100
Subject: [PATCH] Fix crash when game name cannot be parsed (#216)

---
 src/ui/gui/gui_netplay.rs | 10 ++++++----
 src/ui/storage.rs         |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/ui/gui/gui_netplay.rs b/src/ui/gui/gui_netplay.rs
index c1a88b6..5cb816d 100644
--- a/src/ui/gui/gui_netplay.rs
+++ b/src/ui/gui/gui_netplay.rs
@@ -395,10 +395,12 @@ fn parse_rom_file(file: std::path::PathBuf, tx: std::sync::mpsc::Sender<GameInfo
     let rom_contents = device::get_rom_contents(file.as_path());
     if !rom_contents.is_empty() {
         let hash = device::cart::rom::calculate_hash(&rom_contents);
-        let game_name = std::str::from_utf8(&rom_contents[0x20..0x20 + 0x14])
-            .unwrap()
-            .trim()
-            .replace('\0', "");
+        let mut game_name = "Unknown".to_owned();
+        let header_value = std::str::from_utf8(&rom_contents[0x20..0x34]);
+        if header_value.is_ok() {
+            game_name = header_value.unwrap().trim().replace('\0', "");
+        }
+
         tx.send((
             hash,
             game_name,
diff --git a/src/ui/storage.rs b/src/ui/storage.rs
index 4122025..112a23a 100644
--- a/src/ui/storage.rs
+++ b/src/ui/storage.rs
@@ -109,10 +109,11 @@ pub fn init(ui: &mut ui::Ui, rom: &[u8]) {
 
     let base_path = ui.dirs.data_dir.join("saves");
 
-    let game_name = std::str::from_utf8(&rom[0x20..0x20 + 0x14])
-        .unwrap()
-        .trim()
-        .replace('\0', "");
+    let mut game_name = "".to_owned();
+    let header_value = std::str::from_utf8(&rom[0x20..0x34]);
+    if header_value.is_ok() {
+        game_name = header_value.unwrap().trim().replace('\0', "");
+    }
 
     let prefix = if game_name.is_empty() {
         &ui.game_id