summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/fileio.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/emu/fileio.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/emu/fileio.cpp')
-rw-r--r--src/emu/fileio.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emu/fileio.cpp b/src/emu/fileio.cpp
index bbd1d931f30..3ec686266c8 100644
--- a/src/emu/fileio.cpp
+++ b/src/emu/fileio.cpp
@@ -96,7 +96,7 @@ bool path_iterator::next(std::string &buffer, const char *name)
if (name)
{
// compute the full pathname
- if (!buffer.empty() && !util::is_directory_separator(buffer.back()))
+ if (!buffer.empty() && (*buffer.rbegin() != *PATH_SEPARATOR))
buffer.append(PATH_SEPARATOR);
buffer.append(name);
}