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

3 files changed, 6 insertions, 6 deletions

diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp
index 13c2ebbb07..d4bb82506f 100644
--- a/Source/Core/DiscIO/Src/VolumeGC.cpp
+++ b/Source/Core/DiscIO/Src/VolumeGC.cpp
@@ -91,11 +91,11 @@ std::string CVolumeGC::GetMakerID() const
 std::string CVolumeGC::GetName() const
 {
 	if (m_pReader == NULL)
-		return false;
+		return "";
 
 	char name[128];
 	if (!Read(0x20, 0x60, (u8*)&name))
-		return false;
+		return "";
 
 	return name;
 }
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;
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
index 967ae26624..fc7d57e565 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
@@ -152,14 +152,14 @@ std::string CVolumeWiiCrypted::GetName() const
 {
 	if (m_pReader == NULL)
 	{
-		return(false);
+		return("");
 	}
 
 	char name[0xFF];
 
 	if (!Read(0x20, 0x60, (u8*)&name))
 	{
-		return(false);
+		return("");
 	}
 
 	return(name);