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, RomTools] Fix convert, fix sort

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-18 13:03:51 -07:00
parent 7f08c80341
commit ffbd416174
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2784,6 +2784,14 @@ namespace SabreTools.Helper
for (int index = 0; index < roms.Count; index++) for (int index = 0; index < roms.Count; index++)
{ {
Rom rom = roms[index]; Rom rom = roms[index];
// There are apparently times when a null rom can skip by, skip them
if (rom.Name == null || rom.Machine.Name == null)
{
logger.Warning("Null rom found!");
continue;
}
List<string> newsplit = rom.Machine.Name.Split('\\').ToList(); List<string> newsplit = rom.Machine.Name.Split('\\').ToList();
// If we have a different game and we're not at the start of the list, output the end of last item // If we have a different game and we're not at the start of the list, output the end of last item
@@ -2969,6 +2977,7 @@ namespace SabreTools.Helper
// Write the header out // Write the header out
sw.Write(header); sw.Write(header);
sw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -3040,6 +3049,7 @@ namespace SabreTools.Helper
} }
sw.Write(state); sw.Write(state);
sw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -3112,6 +3122,7 @@ namespace SabreTools.Helper
} }
sw.Write(state); sw.Write(state);
sw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -3290,6 +3301,7 @@ namespace SabreTools.Helper
} }
sw.Write(state); sw.Write(state);
sw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -3354,6 +3366,7 @@ namespace SabreTools.Helper
// Write the footer out // Write the footer out
sw.Write(footer); sw.Write(footer);
sw.Flush();
} }
catch (Exception ex) catch (Exception ex)
{ {

2
SabreTools.Helper/Tools/RomTools.cs
View File

@@ -240,7 +240,7 @@ namespace SabreTools.Helper
{ {
if (Path.GetDirectoryName(x.Name) == Path.GetDirectoryName(y.Name)) if (Path.GetDirectoryName(x.Name) == Path.GetDirectoryName(y.Name))
{ {
return Style.CompareNumeric((x.Name), Path.GetFileName(y.Name)); return Style.CompareNumeric(Path.GetFileName(x.Name), Path.GetFileName(y.Name));
} }
return Style.CompareNumeric(Path.GetDirectoryName(x.Name), Path.GetDirectoryName(y.Name)); return Style.CompareNumeric(Path.GetDirectoryName(x.Name), Path.GetDirectoryName(y.Name));
} }