diff options
Diffstat (limited to 'docs/release/src/osd/winui/emu_opts.cpp')
-rw-r--r-- | docs/release/src/osd/winui/emu_opts.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/docs/release/src/osd/winui/emu_opts.cpp b/docs/release/src/osd/winui/emu_opts.cpp index 74a2445ba82..21bf6934407 100644 --- a/docs/release/src/osd/winui/emu_opts.cpp +++ b/docs/release/src/osd/winui/emu_opts.cpp @@ -174,11 +174,10 @@ string GetIniDir(void) // load mewui settings static void LoadSettingsFile(ui_options &opts, const char *filename) { - osd_file::error filerr; util::core_file::ptr file; - filerr = util::core_file::open(filename, OPEN_FLAG_READ, file); - if (filerr == osd_file::error::NONE) + std::error_condition filerr = util::core_file::open(filename, OPEN_FLAG_READ, file); + if (!filerr) { opts.parse_ini_file(*file, OPTION_PRIORITY_CMDLINE, true, true); file.reset(); @@ -188,11 +187,10 @@ static void LoadSettingsFile(ui_options &opts, const char *filename) // load a game ini static void LoadSettingsFile(windows_options &opts, const char *filename) { - osd_file::error filerr; util::core_file::ptr file; - filerr = util::core_file::open(filename, OPEN_FLAG_READ, file); - if (filerr == osd_file::error::NONE) + std::error_condition filerr = util::core_file::open(filename, OPEN_FLAG_READ, file); + if (!filerr) { opts.parse_ini_file(*file, OPTION_PRIORITY_CMDLINE, true, true); file.reset(); @@ -202,12 +200,11 @@ static void LoadSettingsFile(windows_options &opts, const char *filename) // This saves changes to <game>.INI or MAME.INI only static void SaveSettingsFile(windows_options &opts, const char *filename) { - osd_file::error filerr = osd_file::error::NONE; util::core_file::ptr file; - filerr = util::core_file::open(filename, OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, file); + std::error_condition filerr = util::core_file::open(filename, OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, file); - if (filerr == osd_file::error::NONE) + if (!filerr) { string inistring = opts.output_ini(); // printf("=====%s=====\n%s\n",filename,inistring.c_str()); // for debugging @@ -441,12 +438,11 @@ string dir_get_value(int dir_index) // This saves changes to UI.INI only static void SaveSettingsFile(ui_options &opts, const char *filename) { - osd_file::error filerr = osd_file::error::NONE; util::core_file::ptr file; - filerr = util::core_file::open(filename, OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, file); + std::error_condition filerr = util::core_file::open(filename, OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, file); - if (filerr == osd_file::error::NONE) + if (!filerr) { string inistring = opts.output_ini(); file->puts(inistring.c_str()); |