summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/Src/VolumeWad.cpp
diff options
context:
space:
mode:
authorfgfemperor <fgfemperor@gmail.com>2010-01-09 22:03:20 +0000
committerfgfemperor <fgfemperor@gmail.com>2010-01-09 22:03:20 +0000
commit175162e66170c0b66e152ddae7f8738facbe2f16 (patch)
treeeab6627446c2b866a3b3ff0dda506047d7f5669c /Source/Core/DiscIO/Src/VolumeWad.cpp
parent1a5817f6fdcf2fd5967809422c252e503d930b13 (diff)
Fixed Issue 1979 - Crash when scanning WAD files with no title information...
Removed the panic alert about HCI_CMD_INQUIRY because it doesn't crash Dolphin or anything like that... It's called from MiiChannel, when you try to upload your Miis to a WiiMote. And it works just fine! (except for the warning "Can't find Wiimote by bd: xx:xx:xx:xx:xx:xx", which is really odd)... git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4800 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/VolumeWad.cpp')
-rw-r--r--Source/Core/DiscIO/Src/VolumeWad.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/Src/VolumeWad.cpp b/Source/Core/DiscIO/Src/VolumeWad.cpp
index cae2fbfb6d..26e645693a 100644
--- a/Source/Core/DiscIO/Src/VolumeWad.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWad.cpp
@@ -110,12 +110,12 @@ std::string CVolumeWAD::GetName() const
u32 footer_size;
if (!Read(0x1C, 4, (u8*)&footer_size))
- return false;
+ return "";
// Offset to the english title
char temp[84];
if (!Read(0xF1 + OpeningBnrOffset, 84, (u8*)&temp) || Common::swap32(footer_size) < 0xF1)
- return false;
+ return "";
// Remove the null bytes due to 16bit char length
std::string out_temp;