ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5383 from JosJuice/getwiifspath-condition 

ISOFile/GameFile: Correct GetWiiFSPath condition
This commit is contained in:
Léo Lam 2017-05-07 18:48:43 +02:00 committed by GitHub
parent 71400745cc 9b8089bb70
commit eff8c1eb48
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/GameList/GameFile.cpp
View File

@ -336,7 +336,7 @@ bool GameFile::ExportWiiSave()
QString GameFile::GetWiiFSPath() const QString GameFile::GetWiiFSPath() const
{ {
_assert_(m_platform != DiscIO::Platform::GAMECUBE_DISC); _assert_(m_platform == DiscIO::Platform::WII_DISC || m_platform == DiscIO::Platform::WII_WAD);
const std::string path = Common::GetTitleDataPath(m_title_id, Common::FROM_CONFIGURED_ROOT); const std::string path = Common::GetTitleDataPath(m_title_id, Common::FROM_CONFIGURED_ROOT);

20
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -361,20 +361,16 @@ std::vector<DiscIO::Language> GameListItem::GetLanguages() const
const std::string GameListItem::GetWiiFSPath() const const std::string GameListItem::GetWiiFSPath() const
{ {
std::string ret; if (m_Platform != DiscIO::Platform::WII_DISC && m_Platform != DiscIO::Platform::WII_WAD)
return "";
if (m_Platform != DiscIO::Platform::GAMECUBE_DISC) const std::string path = Common::GetTitleDataPath(m_title_id, Common::FROM_CONFIGURED_ROOT);
{
const std::string path = Common::GetTitleDataPath(m_title_id, Common::FROM_CONFIGURED_ROOT);
if (!File::Exists(path)) if (!File::Exists(path))
File::CreateFullPath(path); File::CreateFullPath(path);
if (path[0] == '.') if (path[0] == '.')
ret = WxStrToStr(wxGetCwd()) + path.substr(strlen(ROOT_DIR)); return WxStrToStr(wxGetCwd()) + path.substr(strlen(ROOT_DIR));
else
ret = path;
}
return ret; return path;
} }