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

Missed a place where dupe was being used

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-10 21:03:41 -07:00
parent 382f74afaa
commit 970331c2b2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OfflineMerge/OfflineMerge.cs
View File

@@ -156,7 +156,7 @@ namespace SabreTools
List<RomData> templist = RomManipulation.Merge(completeDats[key]); List<RomData> templist = RomManipulation.Merge(completeDats[key]);
foreach (RomData rom in templist) foreach (RomData rom in templist)
{ {
if (!rom.Dupe && rom.System == _currentNewMerged) if (rom.Dupe == DupeType.None && rom.System == _currentNewMerged)
{ {
if (netNew.ContainsKey(key)) if (netNew.ContainsKey(key))
{ {
@@ -180,7 +180,7 @@ namespace SabreTools
List<RomData> templist = RomManipulation.Merge(completeDats[key]); List<RomData> templist = RomManipulation.Merge(completeDats[key]);
foreach (RomData rom in templist) foreach (RomData rom in templist)
{ {
if (!rom.Dupe && rom.System == _currentAllMerged) if (rom.Dupe == DupeType.None && rom.System == _currentAllMerged)
{ {
if (unneeded.ContainsKey(key)) if (unneeded.ContainsKey(key))
{ {
@@ -217,7 +217,7 @@ namespace SabreTools
List<RomData> templist = RomManipulation.Merge(midMissing[key]); List<RomData> templist = RomManipulation.Merge(midMissing[key]);
foreach (RomData rom in templist) foreach (RomData rom in templist)
{ {
if (!rom.Dupe && rom.System == _currentMissingMerged) if (rom.Dupe == DupeType.None && rom.System == _currentMissingMerged)
{ {
if (newMissing.ContainsKey(key)) if (newMissing.ContainsKey(key))
{ {
@@ -289,7 +289,7 @@ namespace SabreTools
List<RomData> templist = RomManipulation.Merge(midHave[key]); List<RomData> templist = RomManipulation.Merge(midHave[key]);
foreach (RomData rom in templist) foreach (RomData rom in templist)
{ {
if (!rom.Dupe && rom.System == _currentNewMerged) if (rom.Dupe == DupeType.None && rom.System == _currentNewMerged)
{ {
if (have.ContainsKey(key)) if (have.ContainsKey(key))
{ {
@@ -404,7 +404,7 @@ namespace SabreTools
List<RomData> templist = RomManipulation.Merge(midHave[key]); List<RomData> templist = RomManipulation.Merge(midHave[key]);
foreach (RomData rom in templist) foreach (RomData rom in templist)
{ {
if (!rom.Dupe && rom.System == _currentAllMerged) if (rom.Dupe == DupeType.None && rom.System == _currentAllMerged)
{ {
if (have.ContainsKey(key)) if (have.ContainsKey(key))
{ {
@@ -461,7 +461,7 @@ namespace SabreTools
List<RomData> templist = RomManipulation.Merge(midHave[key]); List<RomData> templist = RomManipulation.Merge(midHave[key]);
foreach (RomData rom in templist) foreach (RomData rom in templist)
{ {
if (!rom.Dupe && rom.System == _currentNewMerged) if (rom.Dupe == DupeType.None && rom.System == _currentNewMerged)
{ {
if (have.ContainsKey(key)) if (have.ContainsKey(key))
{ {