Fix some distinct applications being erronously merged

Klocman · May 20, 2023 · e4b5147 · e4b5147
1 parent 6b868aa
commit e4b5147
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/source/UninstallTools/Factory/ApplicationEntryTools.cs b/source/UninstallTools/Factory/ApplicationEntryTools.cs
@@ -42,12 +42,14 @@ public static int AreEntriesRelated(ApplicationUninstallerEntry baseEntry, Appli
                 if (PathTools.PathsEqual(baseEntry.UninstallString, otherEntry.UninstallString))
                     return 100;
 
-                if (!string.IsNullOrEmpty(otherEntry.InstallLocation) 
+                if (otherEntry.IsOrphaned 
+                    && !string.IsNullOrEmpty(otherEntry.InstallLocation) 
                     && baseEntry.UninstallString.Contains(otherEntry.InstallLocation, StringComparison.InvariantCultureIgnoreCase))
                     return 100;
             }
 
-            if (!string.IsNullOrEmpty(baseEntry.UninstallerLocation) && !string.IsNullOrEmpty(otherEntry.InstallLocation)
+            if (otherEntry.IsOrphaned 
+                && !string.IsNullOrEmpty(baseEntry.UninstallerLocation) && !string.IsNullOrEmpty(otherEntry.InstallLocation)
                 && baseEntry.UninstallerLocation.StartsWith(otherEntry.InstallLocation, StringComparison.InvariantCultureIgnoreCase))
                 return 100;