diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/emu/emuopts.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/emu/emuopts.cpp')
-rw-r--r-- | src/emu/emuopts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index 332c9c2d787..f8127e28dbb 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -568,8 +568,8 @@ bool emu_options::parse_one_ini(const char *basename, int priority, std::string // open the file; if we fail, that's ok emu_file file(ini_path(), OPEN_FLAG_READ); - file_error filerr = file.open(basename, ".ini"); - if (filerr != FILERR_NONE) + osd_file::error filerr = file.open(basename, ".ini"); + if (filerr != osd_file::error::NONE) return false; // parse the file |