- fix always show iwad box - don't show if queryiwad is false, or if -iwad parameter is used

This commit is contained in:
Rachael Alexanderson 2024-05-03 14:45:25 -04:00
parent 7ef6fa97a7
commit 35f5e0498e
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0

View file

@ -727,8 +727,10 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
} }
int pick = 0; int pick = 0;
// We got more than one so present the IWAD selection box. // Present the IWAD selection box.
if (picks.Size() > 0) bool alwaysshow = (queryiwad && !Args->CheckParm("-iwad"));
if (alwaysshow || picks.Size() > 1)
{ {
// Locate the user's prefered IWAD, if it was found. // Locate the user's prefered IWAD, if it was found.
if (defaultiwad[0] != '\0') if (defaultiwad[0] != '\0')
@ -743,7 +745,7 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
} }
} }
} }
if (picks.Size() > 0) if (alwaysshow || picks.Size() > 1)
{ {
if (!havepicked) if (!havepicked)
{ {