summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-01-19 18:07:50 +1100
committer Vas Crabb <vas@vastheman.com>2019-01-19 18:07:50 +1100
commit3c158de6242ff3a0f822752701609ba347d6cd77 (patch)
tree8165d9d17b13bb9c27471597bad9511c3eed5817
parent9198c2bd58d31310a324ad0180c57e503c630d0f (diff)
see if Tea-CI likes this better (nw)
-rw-r--r--src/frontend/mame/ui/selgame.cpp4
-rw-r--r--src/frontend/mame/ui/selsoft.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp
index aaf73703d62..43deb8ae81b 100644
--- a/src/frontend/mame/ui/selgame.cpp
+++ b/src/frontend/mame/ui/selgame.cpp
@@ -1207,12 +1207,12 @@ render_texture *menu_select_game::get_icon_texture(int linenum, void *selectedre
bitmap_argb32 tmp;
emu_file snapfile(std::string(m_icon_paths), OPEN_FLAG_READ);
- if (snapfile.open(std::string(driver->name).append(".ico")) == osd_file::error::NONE)
+ if (snapfile.open(std::string(driver->name), ".ico") == osd_file::error::NONE)
{
render_load_ico_highest_detail(snapfile, tmp);
snapfile.close();
}
- if (!tmp.valid() && cloneof && (snapfile.open(std::string(driver->parent).append(".ico")) == osd_file::error::NONE))
+ if (!tmp.valid() && cloneof && (snapfile.open(std::string(driver->parent), ".ico") == osd_file::error::NONE))
{
render_load_ico_highest_detail(snapfile, tmp);
snapfile.close();
diff --git a/src/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp
index 84709e49d89..5ee05186028 100644
--- a/src/frontend/mame/ui/selsoft.cpp
+++ b/src/frontend/mame/ui/selsoft.cpp
@@ -583,12 +583,12 @@ render_texture *menu_select_software::get_icon_texture(int linenum, void *select
bitmap_argb32 tmp;
emu_file snapfile(std::string(paths->second), OPEN_FLAG_READ);
- if (snapfile.open(std::string(swinfo->shortname).append(".ico")) == osd_file::error::NONE)
+ if (snapfile.open(std::string(swinfo->shortname), ".ico") == osd_file::error::NONE)
{
render_load_ico_highest_detail(snapfile, tmp);
snapfile.close();
}
- if (!tmp.valid() && !swinfo->parentname.empty() && (snapfile.open(std::string(swinfo->parentname).append(".ico")) == osd_file::error::NONE))
+ if (!tmp.valid() && !swinfo->parentname.empty() && (snapfile.open(std::string(swinfo->parentname), ".ico") == osd_file::error::NONE))
{
render_load_ico_highest_detail(snapfile, tmp);
snapfile.close();
@@ -653,13 +653,13 @@ void menu_select_software::filter_selected()
it->second->show_ui(
ui(),
container(),
- [this, &driver = m_driver] (software_filter &filter)
+ [this] (software_filter &filter)
{
software_filter::type const new_type(filter.get_type());
if (software_filter::CUSTOM == new_type)
{
emu_file file(ui().options().ui_path(), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS);
- if (file.open("custom_", driver.name, "_filter.ini") == osd_file::error::NONE)
+ if (file.open("custom_", m_driver.name, "_filter.ini") == osd_file::error::NONE)
{
filter.save_ini(file, 0);
file.close();