From 6c59efa63b8809c0ba02785b5debfb25ef3e9706 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 1 Apr 2025 16:25:22 -0400
Subject: [PATCH] Ensure game name in SuperDAT

---
 SabreTools.DatTools/MergeSplit.cs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/SabreTools.DatTools/MergeSplit.cs b/SabreTools.DatTools/MergeSplit.cs
index 22c1b20f..023b5793 100644
--- a/SabreTools.DatTools/MergeSplit.cs
+++ b/SabreTools.DatTools/MergeSplit.cs
@@ -145,11 +145,15 @@ namespace SabreTools.DatTools
                     if (machine == null)
                         continue;
 
-                    machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetDirectoryName(filename)
+                    string machineName = Path.GetDirectoryName(filename)
                         + Path.DirectorySeparatorChar
                         + Path.GetFileNameWithoutExtension(filename)
                         + Path.DirectorySeparatorChar
-                        + machine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
+                        + machine.GetStringFieldValue(Models.Metadata.Machine.NameKey);
+                    if (machineName.Length == 0)
+                        machineName = "Default";
+
+                    machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, machineName);
 
                     newItems.Add(newItem);
                 }
@@ -214,9 +218,15 @@ namespace SabreTools.DatTools
 
                     filename = filename.Remove(0, rootpath.Length);
 
-                    machine.Value.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar
-                        + Path.GetFileNameWithoutExtension(filename) + Path.DirectorySeparatorChar
-                        + machine.Value.GetStringFieldValue(Models.Metadata.Machine.NameKey));
+                    string machineName = Path.GetDirectoryName(filename)
+                        + Path.DirectorySeparatorChar
+                        + Path.GetFileNameWithoutExtension(filename)
+                        + Path.DirectorySeparatorChar
+                        + machine.Value.GetStringFieldValue(Models.Metadata.Machine.NameKey);
+                    if (machineName.Length == 0)
+                        machineName = "Default";
+
+                    machine.Value.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, machineName);
                 }
 #if NET40_OR_GREATER || NETCOREAPP
             });