From caa2f15105bdf45b3117ae3f144927d70c61482d Mon Sep 17 00:00:00 2001 From: Trace Bullet Date: Thu, 2 Jul 2015 02:43:18 -0400 Subject: [PATCH 1/2] DiscIO: Check if m_Disc is null in ParsePartitionData() --- Source/Core/DiscIO/DiscScrubber.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 581efc6190..8f2eb8ee5b 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -265,8 +265,14 @@ bool ParsePartitionData(SPartition& _rPartition) // Ready some stuff m_Disc = CreateVolumeFromFilename(m_Filename, _rPartition.GroupNumber, _rPartition.Number); - std::unique_ptr 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 filesystem(CreateFileSystem(m_Disc)); if (!filesystem) { ERROR_LOG(DISCIO, "Failed to create filesystem for group %d partition %u", _rPartition.GroupNumber, _rPartition.Number); From 703b1e86543cbf01028810ed58cb7f39c361ff6c Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 22 Jul 2015 19:30:19 +0200 Subject: [PATCH 2/2] CFrame: Ignore "Pause on Focus Lost" when not started. --- Source/Core/DolphinWX/Frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index d2b396aa3d..05f01a9cb0 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1141,7 +1141,7 @@ void CFrame::OnMouse(wxMouseEvent& event) void CFrame::OnFocusChange(wxFocusEvent& event) { - if (SConfig::GetInstance().m_PauseOnFocusLost) + if (SConfig::GetInstance().m_PauseOnFocusLost && Core::IsRunningAndStarted()) { if (RendererHasFocus()) {