zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-12 10:19:23 +01:00
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 - mkdir build
- cd build - cd build
- cmake ${CMAKE_OPTIONS} -DPK3_QUIET_ZIPDIR=YES .. - cmake ${CMAKE_OPTIONS} -DPK3_QUIET_ZIPDIR=YES ..
- make -j2 - make -j2 -k
notifications: notifications:
email: false email: false

5
src/w_wad.cpp
View file

@ -1363,7 +1363,10 @@ FileReader *FWadCollection::GetFileReader(int wadnum)
{ {
return NULL; 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;
} }
//========================================================================== //==========================================================================