mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-12 23:54:17 +00:00
- fix always show iwad box - don't show if queryiwad is false, or if -iwad parameter is used
This commit is contained in:
parent
7ef6fa97a7
commit
35f5e0498e
1 changed files with 5 additions and 3 deletions
|
@ -727,8 +727,10 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
|
|||
}
|
||||
int pick = 0;
|
||||
|
||||
// We got more than one so present the IWAD selection box.
|
||||
if (picks.Size() > 0)
|
||||
// Present the IWAD selection box.
|
||||
bool alwaysshow = (queryiwad && !Args->CheckParm("-iwad"));
|
||||
|
||||
if (alwaysshow || picks.Size() > 1)
|
||||
{
|
||||
// Locate the user's prefered IWAD, if it was found.
|
||||
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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue