claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DatTools] Fix wiped files from Merge

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-20 16:54:19 -07:00
parent 59d3c47d5b
commit 7f1ad470aa
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -1659,7 +1659,7 @@ namespace SabreTools.Helper
foreach (string input in inputs) foreach (string input in inputs)
{ {
logger.User("Adding DAT: " + input.Split('¬')[0]); logger.User("Adding DAT: " + input.Split('¬')[0]);
userData = DatTools.Parse(input.Split('¬')[0], i, 0, userData, logger, true, clean); userData = Parse(input.Split('¬')[0], i, 0, userData, logger, true, clean);
i++; i++;
// If we are in inplace mode or redirecting output, save the DAT data // If we are in inplace mode or redirecting output, save the DAT data
@@ -1668,21 +1668,16 @@ namespace SabreTools.Helper
datHeaders.Add((Dat)userData.CloneHeader()); datHeaders.Add((Dat)userData.CloneHeader());
// Reset the header values so the next can be captured // Reset the header values so the next can be captured
userData.FileName = ""; Dictionary<string, List<Rom>> temp = userData.Roms;
userData.Name = ""; userData = new Dat();
userData.Description = ""; userData.Roms = temp;
userData.Version = "";
userData.Date = "";
userData.Category = "";
userData.Author = "";
userData.ForcePacking = ForcePacking.None;
userData.OutputFormat = OutputFormat.None;
userData.Type = "";
} }
} }
// Set the output values // Set the output values
Dictionary<string, List<Rom>> roms = userData.Roms;
userData = (Dat)inputDat.CloneHeader(); userData = (Dat)inputDat.CloneHeader();
userData.Roms = roms;
return datHeaders; return datHeaders;
} }

9
SabreTools/Partials/SabreTools_Inits.cs
View File

@@ -277,15 +277,6 @@ namespace SabreTools
{ {
author = "SabreTools"; author = "SabreTools";
} }
if (outdir == "")
{
outdir = Environment.CurrentDirectory;
}
else if (!Directory.Exists(outdir))
{
Directory.CreateDirectory(outdir);
}
} }
// Populate the DatData object // Populate the DatData object