Merge branch 'stable'

dolphin-emu · Jul 23, 2015 · ed50d61 · ed50d61
2 parents 8bd1084 + 2c7ae77
commit ed50d61
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
@@ -1158,7 +1158,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())
 		{