From a03aa3089586ffdb2c4154fe6cc6a74aaef5a7e5 Mon Sep 17 00:00:00 2001 From: "fires.gc" Date: Wed, 4 Mar 2009 19:13:51 +0000 Subject: [PATCH] fix if ya load an invalid NAND app git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2548 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/Boot/Boot.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 3e87926170..6a934999c2 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -98,13 +98,17 @@ std::string CBoot::GenerateMapFilename() sprintf(tmpBuffer, "%08x_%08x", TitleID>32, TitleID); return FULL_MAPS_DIR + std::string(tmpBuffer) + ".map"; } - } + } + break; + case SCoreStartupParameter::BOOT_ELF: case SCoreStartupParameter::BOOT_DOL: return _StartupPara.m_strFilename.substr(0, _StartupPara.m_strFilename.size()-4) + ".map"; default: return FULL_MAPS_DIR + _StartupPara.GetUniqueID() + ".map"; } + + return std::string("unknown map"); } bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_gameID)