From 3dee0e0149f85f4b2fb37823bf11374be97c0938 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 23 Feb 2013 13:32:12 -0800
Subject: [PATCH] Add a timeout so quit doesn't hang.

Kinda like before except now it'll quit faster if possible.
---
 Core/Core.cpp | 4 ++--
 native        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/Core.cpp b/Core/Core.cpp
index a7d9e90b4c..481c1f4b2a 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -89,8 +89,8 @@ void Core_WaitInactive()
 
 void Core_WaitInactive(int milliseconds)
 {
-	// TODO
-	Core_WaitInactive();
+	while (!Core_IsInactive())
+		m_hInactiveEvent.wait_for(m_hInactiveMutex, milliseconds);
 }
 
 void Core_RunLoop()
diff --git a/native b/native
index a9a067ef84..9c183fcca8 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit a9a067ef8473628f170dfdab1f7692b53a5f130b
+Subproject commit 9c183fcca8416a34d510880d483ccf5f2ec573f4