From 6bf381bec932f592c1bf67638ab233ea4d487ac0 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 2 Sep 2020 15:07:25 -0700
Subject: [PATCH] Fix merging issue

---
 SabreTools.Library/DatItems/DatItem.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SabreTools.Library/DatItems/DatItem.cs b/SabreTools.Library/DatItems/DatItem.cs
index 16de3d26..7db9d5a0 100644
--- a/SabreTools.Library/DatItems/DatItem.cs
+++ b/SabreTools.Library/DatItems/DatItem.cs
@@ -608,7 +608,10 @@ namespace SabreTools.Library.DatItems
         {
             try
             {
-                return ItemType - other.ItemType;
+                if (GetName() == other.GetName())
+                    return Equals(other) ? 0 : 1;
+
+                return string.Compare(GetName(), other.GetName());
             }
             catch
             {
@@ -639,7 +642,7 @@ namespace SabreTools.Library.DatItems
             // If the duplicate is external already or should be, set it
             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;
                 else
                     output = DupeType.External | DupeType.Hash;
@@ -648,7 +651,7 @@ namespace SabreTools.Library.DatItems
             // Otherwise, it's considered an internal dupe
             else
             {
-                if (lastItem.Machine.Name == Machine.Name)
+                if (lastItem.Machine.Name == Machine.Name && lastItem.GetName() == GetName())
                     output = DupeType.Internal | DupeType.All;
                 else
                     output = DupeType.Internal | DupeType.Hash;