Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 18:23:08 +03:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Three times is a charm

Browse Source
This commit is contained in:
Nathan Woods 2016-07-30 09:28:48 -04:00
parent eb79ffac88
commit 0df4a2339a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/emu/diimage.cpp
View File

@ -196,26 +196,21 @@ void device_image_interface::set_image_filename(const std::string &filename)
m_image_name.rend(), m_image_name.rend(),
[](char c) { return (c == '\\') || (c == '/') || (c == ':'); }); [](char c) { return (c == '\\') || (c == '/') || (c == ':'); });
// get the position if (iter != m_image_name.rend())
std::string::size_type loc = (iter != m_image_name.rend())
? (&*iter - &m_image_name[0])
: std::string::npos;
if (loc != std::string::npos)
{ {
if (*iter == ':') if (*iter == ':')
{ {
// temp workaround for softlists now that m_image_name contains the part name too (e.g. list:gamename:cart) // temp workaround for softlists now that m_image_name contains the part name too (e.g. list:gamename:cart)
m_basename = m_basename.substr(0, loc); m_basename.assign(m_image_name.begin(), std::next(iter).base());
int tmploc = m_basename.find_last_of(':'); int tmploc = m_basename.find_last_of(':');
m_basename = m_basename.substr(tmploc + 1, loc - tmploc); m_basename = m_basename.substr(tmploc + 1);
} }
else else
m_basename = m_basename.substr(loc + 1); m_basename.assign(iter.base(), m_image_name.end());
} }
m_basename_noext = m_basename; m_basename_noext = m_basename;
m_filetype = ""; m_filetype = "";
loc = m_basename_noext.find_last_of('.'); auto loc = m_basename_noext.find_last_of('.');
if (loc != std::string::npos) if (loc != std::string::npos)
{ {
m_basename_noext = m_basename_noext.substr(0, loc); m_basename_noext = m_basename_noext.substr(0, loc);