Merge branch 'stable'

This commit is contained in:
Jules Blok 2015-07-23 08:12:57 +02:00
commit ed50d61287
1 changed files with 1 additions and 1 deletions

View File

@ -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())
{