Merge branch 'origin/maint'

This commit is contained in:
Braden Obrzut 2014-01-10 02:19:14 -05:00
commit db4a23e3c4
1 changed files with 9 additions and 0 deletions

View File

@ -1861,6 +1861,15 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
sc.MustGetString();
DoomStartupInfo.Song = sc.String;
}
else
{
// Silently ignore unknown properties
do
{
sc.MustGetAnyToken();
}
while(sc.CheckToken(','));
}
}
return iwad;
}