diff options
author | 2016-04-27 15:42:06 -0400 | |
---|---|---|
committer | 2016-04-27 15:42:06 -0400 | |
commit | b3578a6ec8ee41328cb1b02d462c41b18fbcee2d (patch) | |
tree | 43526309acdbb0f67adad001a5b73e034301fd7e /src/frontend/mame/ui/floppycntrl.cpp | |
parent | e06384aaba8f618ad049d9fe933c76eccf24594a (diff) | |
parent | fe6b9390c7b7a8887db644e62d102976939cd922 (diff) |
Merge remote-tracking branch 'upstream/master' into mui
Diffstat (limited to 'src/frontend/mame/ui/floppycntrl.cpp')
-rw-r--r-- | src/frontend/mame/ui/floppycntrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontend/mame/ui/floppycntrl.cpp b/src/frontend/mame/ui/floppycntrl.cpp index 665eaebb50c..a8ffc764a4b 100644 --- a/src/frontend/mame/ui/floppycntrl.cpp +++ b/src/frontend/mame/ui/floppycntrl.cpp @@ -83,7 +83,7 @@ void ui_menu_control_floppy_image::hook_load(std::string filename, bool softlist osd_file::error filerr; std::string tmp_path; util::core_file::ptr tmp_file; - // attempt to open the file for writing but *without* create + // attempt to open the file for writing but *without* create filerr = util::zippath_fopen(filename.c_str(), OPEN_FLAG_READ | OPEN_FLAG_WRITE, tmp_file, tmp_path); if(filerr == osd_file::error::NONE) tmp_file.reset(); @@ -167,4 +167,4 @@ void ui_menu_control_floppy_image::handle() default: ui_menu_control_device_image::handle(); } -}
\ No newline at end of file +} |