summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2015-07-23 08:12:57 +0200
committerJules Blok <jules.blok@gmail.com>2015-07-23 08:12:57 +0200
commited50d61287a3ee68a8f8ad6e5a4e52d89dfb78f3 (patch)
treeefc5a329b38e4723ed5f17971930f99e56d6778d /Source/Core/DolphinWX/Frame.cpp
parent8bd108426e5ee049d4158e33c57b9563f41108ba (diff)
parent2c7ae7787d7c5f564b0acc52b7a8f23263c47b2e (diff)
Merge branch 'stable'
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 94b8062206..9c455d1020 100644
--- 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())
{