From e6bb49fb0d375e29d6e2163920fe4fa90a852aa5 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 30 Jun 2013 22:47:39 -0700 Subject: [PATCH] Allow Core_WaitInactive() when already inactive. It's being called unconditionally now, it was changed in the other one, so I guess it needs changing here. --- Core/Core.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/Core.cpp b/Core/Core.cpp index d1170cce73..fa1eb8d40f 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -88,7 +88,8 @@ void Core_WaitInactive() void Core_WaitInactive(int milliseconds) { - m_hInactiveEvent.wait_for(m_hInactiveMutex, milliseconds); + if (Core_IsActive()) + m_hInactiveEvent.wait_for(m_hInactiveMutex, milliseconds); } void UpdateScreenScale() {