summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorsl1nk3.s <sl1nk3.s@gmail.com>2009-04-27 23:27:56 +0000
committersl1nk3.s <sl1nk3.s@gmail.com>2009-04-27 23:27:56 +0000
commitadb791dd587eb81d2d6a2210d4cdcb1c68600e71 (patch)
tree21747c9d137d2f33dff3295ad6ee5c76551eac4e /Source/Core
parent989f4fb6da3f5aadc572311b5c49d8077912ad78 (diff)
Fixed a little crash I had in ISOProperties with Mario Kart Wii, it was trying to read a third unknown partition type.
Effectively toggling throttle in DSP HLE/LLE when the game is running git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3096 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DiscIO/Src/FileSystemGCWii.cpp2
-rw-r--r--Source/Core/DolphinWX/Src/ISOProperties.cpp8
2 files changed, 7 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
index 4afdad5a73..370b6881f8 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
@@ -166,6 +166,8 @@ bool CFileSystemGCWii::InitFileSystem()
}
else
{
+ // Mario Kart Wii gets here on its third partition...
+ // Does it use a fake partition ? another type we don't know ?
return false;
}
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 59b470f722..6721527042 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -71,9 +71,11 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
WiiPartition temp;
if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, i)) != NULL)
{
- temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition);
- temp.FileSystem->GetFileList(temp.Files);
- WiiDisc.push_back(temp);
+ if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != NULL)
+ {
+ temp.FileSystem->GetFileList(temp.Files);
+ WiiDisc.push_back(temp);
+ }
}
else
break;