diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2021-02-03 17:45:37 -0500 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2021-02-03 17:45:37 -0500 |
commit | f806cfd21c83cf0c013cf721ab2adae3eecdb6ad (patch) | |
tree | 2a93b24eef90e4b663792e5843ea11e429b14f22 /src/emu | |
parent | bcf647342a9643fedfba6d9ebc3be56bcc4c1cf1 (diff) |
render/bgfx: Fix failure to load texture .png files when -artpath contains multiple directories
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/fileio.cpp | 4 | ||||
-rw-r--r-- | src/emu/fileio.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/fileio.cpp b/src/emu/fileio.cpp index a1c983da39f..7d5954b2739 100644 --- a/src/emu/fileio.cpp +++ b/src/emu/fileio.cpp @@ -155,7 +155,7 @@ void path_iterator::reset() // in the search path //------------------------------------------------- -const osd::directory::entry *file_enumerator::next() +const osd::directory::entry *file_enumerator::next(const char *subdir) { // loop over potentially empty directories while (true) @@ -164,7 +164,7 @@ const osd::directory::entry *file_enumerator::next() while (!m_curdir) { // if we fail to get anything more, we're done - if (!m_iterator.next(m_pathbuffer)) + if (!m_iterator.next(m_pathbuffer, subdir)) return nullptr; // open the path diff --git a/src/emu/fileio.h b/src/emu/fileio.h index 4b4c823f8d3..d05905efa83 100644 --- a/src/emu/fileio.h +++ b/src/emu/fileio.h @@ -107,7 +107,7 @@ public: file_enumerator &operator=(file_enumerator const &) = delete; // iterator - const osd::directory::entry *next(); + const osd::directory::entry *next(const char *subdir = nullptr); private: // internal state |