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

Fix merging issue

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-02 15:07:25 -07:00
parent 0794e52f50
commit 6bf381bec9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -608,7 +608,10 @@ namespace SabreTools.Library.DatItems
{ {
try try
{ {
return ItemType - other.ItemType; if (GetName() == other.GetName())
return Equals(other) ? 0 : 1;
return string.Compare(GetName(), other.GetName());
} }
catch catch
{ {
@@ -639,7 +642,7 @@ namespace SabreTools.Library.DatItems
// If the duplicate is external already or should be, set it // If the duplicate is external already or should be, set it
if (lastItem.DupeType.HasFlag(DupeType.External) || lastItem.Source.Index != Source.Index) if (lastItem.DupeType.HasFlag(DupeType.External) || lastItem.Source.Index != Source.Index)
{ {
if (lastItem.Machine.Name == Machine.Name) if (lastItem.Machine.Name == Machine.Name && lastItem.GetName() == GetName())
output = DupeType.External | DupeType.All; output = DupeType.External | DupeType.All;
else else
output = DupeType.External | DupeType.Hash; output = DupeType.External | DupeType.Hash;
@@ -648,7 +651,7 @@ namespace SabreTools.Library.DatItems
// Otherwise, it's considered an internal dupe // Otherwise, it's considered an internal dupe
else else
{ {
if (lastItem.Machine.Name == Machine.Name) if (lastItem.Machine.Name == Machine.Name && lastItem.GetName() == GetName())
output = DupeType.Internal | DupeType.All; output = DupeType.Internal | DupeType.All;
else else
output = DupeType.Internal | DupeType.Hash; output = DupeType.Internal | DupeType.Hash;