From 1f6e201bf1cc94bd9131f84cb99f1864b6d69828 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 12 Mar 2018 10:28:53 +0200 Subject: [PATCH 1/2] Do not stop Travis build after the first error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4db8a3ec5..b195f64b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,7 @@ script: - mkdir build - cd build - cmake ${CMAKE_OPTIONS} -DPK3_QUIET_ZIPDIR=YES .. - - make -j2 + - make -j2 -k notifications: email: false From e0f7c9949651494b3791ee926b93d98146c61e1a Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 12 Mar 2018 11:00:40 +0200 Subject: [PATCH 2/2] Fixed crash on loading directories --- src/w_wad.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/w_wad.cpp b/src/w_wad.cpp index fc6121b73..18bf2aa39 100644 --- a/src/w_wad.cpp +++ b/src/w_wad.cpp @@ -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; } //==========================================================================