summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/ISOFile.cpp
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2015-09-19 13:49:21 +0200
committerMarkus Wick <degasus@users.noreply.github.com>2015-09-19 13:49:21 +0200
commit1c502b76a55e459f1226deb15404a6180b9820f2 (patch)
treebbcfbc9173f436faabff8da807996b10283e8a7b /Source/Core/DolphinWX/ISOFile.cpp
parent9b08de95224c817815c0705f8531cf007553b57e (diff)
parente2e7fc9029eeb4cb0c6393b1234072627b11aff9 (diff)
Merge pull request #3065 from JosJuice/wad-id-exception
Fix 4.0-7767 regression: exception when handling short WAD IDs
Diffstat (limited to 'Source/Core/DolphinWX/ISOFile.cpp')
-rw-r--r--Source/Core/DolphinWX/ISOFile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp
index 28051d0fb0..82cd73fba5 100644
--- a/Source/Core/DolphinWX/ISOFile.cpp
+++ b/Source/Core/DolphinWX/ISOFile.cpp
@@ -139,8 +139,8 @@ GameListItem::GameListItem(const std::string& _rFileName, const std::unordered_m
std::string game_id = m_UniqueID;
// Ignore publisher ID for WAD files
- if (m_Platform == DiscIO::IVolume::WII_WAD)
- game_id.erase(game_id.size() - 2);
+ if (m_Platform == DiscIO::IVolume::WII_WAD && game_id.size() > 4)
+ game_id.erase(4);
auto end = custom_titles.end();
auto it = custom_titles.find(game_id);