The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 15:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1018 from zhuowei/elf_map_basename_only

Browse Source 
When loading the map file for a DOL/ELF file, extract only the filename from the DOL/ELF's path
This commit is contained in:
skidau 2014-09-30 13:17:29 +10:00
commit da221e3d9c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/Boot/Boot.cpp
View File

@ -70,6 +70,7 @@ bool CBoot::FindMapFile(std::string* existing_map_file,
std::string* writable_map_file) std::string* writable_map_file)
{ {
std::string title_id_str; std::string title_id_str;
size_t name_begin_index;
SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter; SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter;
switch (_StartupPara.m_BootType) switch (_StartupPara.m_BootType)
@ -90,9 +91,14 @@ bool CBoot::FindMapFile(std::string* existing_map_file,
case SCoreStartupParameter::BOOT_ELF: case SCoreStartupParameter::BOOT_ELF:
case SCoreStartupParameter::BOOT_DOL: case SCoreStartupParameter::BOOT_DOL:
// Strip the .elf/.dol file extension // Strip the .elf/.dol file extension and directories before the name
name_begin_index = _StartupPara.m_strFilename.find_last_of("/") + 1;
if ((_StartupPara.m_strFilename.find_last_of("\\") + 1) > name_begin_index)
{
name_begin_index = _StartupPara.m_strFilename.find_last_of("\\") + 1;
}
title_id_str = _StartupPara.m_strFilename.substr( title_id_str = _StartupPara.m_strFilename.substr(
0, _StartupPara.m_strFilename.size() - 4); name_begin_index, _StartupPara.m_strFilename.size() - 4 - name_begin_index);
break; break;
default: default: