zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

This commit is contained in:
Christoph Oelckers 2018-03-12 10:19:23 +01:00
parent def5e1d61b e0f7c99496
commit 3cf1959070
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -99,7 +99,7 @@ script:
- mkdir build
- cd build
- cmake ${CMAKE_OPTIONS} -DPK3_QUIET_ZIPDIR=YES ..
- make -j2
- make -j2 -k
notifications:
email: false

5
src/w_wad.cpp
View File

@ -1363,7 +1363,10 @@ FileReader *FWadCollection::GetFileReader(int wadnum)
{
return NULL;
}
return Files[wadnum]->GetReader();
// Return reader for real files only and nullptr otherwise
FileReader* const reader = Files[wadnum]->GetReader();
return reader->isOpen() ? reader : nullptr;
}
//==========================================================================