Fix missfile output

This commit is contained in:
Matt Nadareski
2021-03-19 20:56:12 -07:00
parent f109da2231
commit 040c8fb39d

View File

@@ -379,17 +379,17 @@ namespace SabreTools.DatFiles
/// <param name="forceRomName">True if the UseRomName should be always on (default), false otherwise</param> /// <param name="forceRomName">True if the UseRomName should be always on (default), false otherwise</param>
protected void ProcessItemName(DatItem item, bool forceRemoveQuotes, bool forceRomName = true) protected void ProcessItemName(DatItem item, bool forceRemoveQuotes, bool forceRomName = true)
{ {
string name = item.GetName() ?? string.Empty;
// Backup relevant values and set new ones accordingly // Backup relevant values and set new ones accordingly
bool quotesBackup = Header.Quotes; bool quotesBackup = Header.Quotes;
bool useRomNameBackup = Header.UseRomName; bool useRomNameBackup = Header.UseRomName;
if (forceRemoveQuotes) if (forceRemoveQuotes)
Header.Quotes = false; Header.Quotes = false;
if (forceRomName) if (forceRomName)
Header.UseRomName = true; Header.UseRomName = true;
// Get the name to update
string name = (Header.UseRomName ? item.GetName() : item.Machine.Name) ?? string.Empty;
// Create the proper Prefix and Postfix // Create the proper Prefix and Postfix
string pre = CreatePrefixPostfix(item, true); string pre = CreatePrefixPostfix(item, true);
string post = CreatePrefixPostfix(item, false); string post = CreatePrefixPostfix(item, false);
@@ -450,8 +450,12 @@ namespace SabreTools.DatFiles
if (Header.UseRomName && Header.GameName) if (Header.UseRomName && Header.GameName)
name = Path.Combine(item.Machine.Name, name); name = Path.Combine(item.Machine.Name, name);
// Now assign back the item name // Now assign back the formatted name
item.SetName($"{pre}{name}{post}"); name = $"{pre}{name}{post}";
if (Header.UseRomName)
item.SetName(name);
else
item.Machine.Name = name;
// Restore all relevant values // Restore all relevant values
if (forceRemoveQuotes) if (forceRemoveQuotes)