Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 00:56:03 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing a stupid merge error that broke image loading

Browse Source
This commit is contained in:
Nathan Woods 2016-08-01 08:13:10 -04:00
parent 15e7be7ac8
commit 2d2a193c02
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/emu/diimage.cpp
View File

@ -938,19 +938,16 @@ image_init_result device_image_interface::load_internal(const std::string &path,
if (core_opens_image_file()) if (core_opens_image_file())
{ {
if (is_create) // determine open plan
{ determine_open_plan(is_create, open_plan);
// determine open plan
determine_open_plan(is_create, open_plan);
// attempt to open the file in various ways // attempt to open the file in various ways
for (i = 0; !m_file && open_plan[i]; i++) for (i = 0; !m_file && open_plan[i]; i++)
{ {
// open the file // open the file
m_err = load_image_by_path(open_plan[i], path); m_err = load_image_by_path(open_plan[i], path);
if (m_err && (m_err != IMAGE_ERROR_FILENOTFOUND)) if (m_err && (m_err != IMAGE_ERROR_FILENOTFOUND))
goto done; goto done;
}
} }
// did we fail to find the file? // did we fail to find the file?