From ca47b138be488dac2ea96d0cf2c9cd7d8e323280 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 27 Aug 2017 09:57:37 +0200 Subject: [PATCH] - fixed missing check for bad IWADs. --- src/d_iwad.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 9691b9cdf..6422b8898 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -598,14 +598,17 @@ int FIWadManager::IdentifyVersion (TArray &wadfiles, const char *iwad, bool picked = false; for (int j = 0; j < (int)mFoundWads.Size(); j++) { - if (mIWadInfos[mFoundWads[j].mInfoIndex].Name.Compare(mOrderNames[i]) == 0) + if (mFoundWads[j].mInfoIndex >= 0) { - if (!picked) + if (mIWadInfos[mFoundWads[j].mInfoIndex].Name.Compare(mOrderNames[i]) == 0) { - picked = true; - picks.Push(mFoundWads[j]); + if (!picked) + { + picked = true; + picks.Push(mFoundWads[j]); + } + mFoundWads.Delete(j--); } - mFoundWads.Delete(j--); } } }