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

[DatItem] Remove the directory/file split

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-26 12:27:01 -07:00
parent ad34192a14
commit 341e946083
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.Helper/Objects/Dat/DatItem.cs
View File

@@ -756,11 +756,7 @@ namespace SabreTools.Helper
{ {
if ((x.Type == ItemType.Rom || x.Type == ItemType.Disk) && (y.Type == ItemType.Rom || y.Type == ItemType.Disk)) if ((x.Type == ItemType.Rom || x.Type == ItemType.Disk) && (y.Type == ItemType.Rom || y.Type == ItemType.Disk))
{ {
if (Path.GetDirectoryName(x.Name) == Path.GetDirectoryName(y.Name)) return nc.Compare(x.Name, y.Name);
{
return nc.Compare(Path.GetFileName(x.Name), Path.GetFileName(y.Name));
}
return nc.Compare(Path.GetDirectoryName(x.Name), Path.GetDirectoryName(y.Name));
} }
else if ((x.Type == ItemType.Rom || x.Type == ItemType.Disk) && (y.Type != ItemType.Rom && y.Type != ItemType.Disk)) else if ((x.Type == ItemType.Rom || x.Type == ItemType.Disk) && (y.Type != ItemType.Rom && y.Type != ItemType.Disk))
{ {
@@ -772,11 +768,7 @@ namespace SabreTools.Helper
} }
else else
{ {
if (Path.GetDirectoryName(x.Name) == Path.GetDirectoryName(y.Name)) return nc.Compare(x.Name, y.Name);
{
return nc.Compare(Path.GetFileName(x.Name), Path.GetFileName(y.Name));
}
return nc.Compare(Path.GetDirectoryName(x.Name), Path.GetDirectoryName(y.Name));
} }
} }
return nc.Compare(x.MachineName, y.MachineName); return nc.Compare(x.MachineName, y.MachineName);