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

DiscIO: Check if m_Disc is null in ParsePartitionData()

This commit is contained in:
Trace Bullet 2015-07-02 02:43:18 -04:00 committed by Jules Blok
parent b5fe028e18
commit caa2f15105
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -265,8 +265,14 @@ bool ParsePartitionData(SPartition& _rPartition)
// Ready some stuff
m_Disc = CreateVolumeFromFilename(m_Filename, _rPartition.GroupNumber, _rPartition.Number);
std::unique_ptr<IFileSystem> filesystem(CreateFileSystem(m_Disc));
if (m_Disc == nullptr)
{
ERROR_LOG(DISCIO, "Failed to create volume from file %s", m_Filename.c_str());
m_Disc = OldVolume;
return false;
}
std::unique_ptr<IFileSystem> filesystem(CreateFileSystem(m_Disc));
if (!filesystem)
{
ERROR_LOG(DISCIO, "Failed to create filesystem for group %d partition %u", _rPartition.GroupNumber, _rPartition.Number);