TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix file_get*list nullptr without constructor inheritance

Browse source
This commit is contained in:
Kp 2015-05-05 03:20:42 +00:00
parent 9ff846d27c
commit 1d08cb6058
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/ui/file.cpp
View file

@ -49,7 +49,7 @@ static PHYSFS_list_t file_getdirlist(int *NumDirs, const char *dir)
++ dlen;
PHYSFS_list_t list{PHYSFS_enumerateFiles(dir)};
if (!list)
return NULL;
return nullptr;
const auto predicate = [&](char *i) -> bool {
if (path.copy_if(dlen, i) && PHYSFS_isDirectory(path))
return false;
@ -79,7 +79,7 @@ static PHYSFS_list_t file_getfilelist(int *NumFiles, const char *filespec, const
{
PHYSFS_list_t list{PHYSFS_enumerateFiles(dir)};
if (!list)
return NULL;
return nullptr;
if (*filespec == '*')
filespec++;