From 34f150958fd258c3ef129fe1282810a11db58d34 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 26 Sep 2016 15:49:46 -0700 Subject: [PATCH] [DatItem] ... uh, that's actually for this one. Previous tweaks writing to all stats but HTML --- SabreTools.Helper/Objects/Dat/DatItem.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/SabreTools.Helper/Objects/Dat/DatItem.cs b/SabreTools.Helper/Objects/Dat/DatItem.cs index a35aacbd..691611d0 100644 --- a/SabreTools.Helper/Objects/Dat/DatItem.cs +++ b/SabreTools.Helper/Objects/Dat/DatItem.cs @@ -756,7 +756,11 @@ namespace SabreTools.Helper { if ((x.Type == ItemType.Rom || x.Type == ItemType.Disk) && (y.Type == ItemType.Rom || y.Type == ItemType.Disk)) { - return nc.Compare(x.Name, y.Name); + if (Path.GetDirectoryName(x.Name) == Path.GetDirectoryName(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)) { @@ -768,7 +772,11 @@ namespace SabreTools.Helper } else { - return nc.Compare(x.Name, y.Name); + if (Path.GetDirectoryName(x.Name) == Path.GetDirectoryName(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);