OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- always show iwad picker, offer option for forks to hide picker by default. this commit was intentionally done in a way to cause merge conflicts so as to force fork maintainers to pay attention to the new option in version.h

Browse source
This commit is contained in:
Rachael Alexanderson 2024-05-03 09:45:20 -04:00
commit bcad040fd3
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/d_iwad.cpp
View file

@ -728,7 +728,7 @@ 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() > 1)
if (picks.Size() > 0)
{
// Locate the user's prefered IWAD, if it was found.
if (defaultiwad[0] != '\0')
@ -743,7 +743,7 @@ int FIWadManager::IdentifyVersion (std::vector<std::string>&wadfiles, const char
}
}
}
if (picks.Size() > 1)
if (picks.Size() > 0)
{
if (!havepicked)
{