Merge pull request #2684 from TraceBullet/master DiscIO: Check if m_Disc is null in ParsePartitionData()
