From 9d4ba3c7fdec9c9d0f76e59763e4204f60e6bef4 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Fri, 4 May 2012 02:16:19 +0000
Subject: [PATCH] - Unraveled the want_native bit in I_CheckNativeMouse
 somewhat to ensure that it ends up false   when menuactive == MENU_WaitKey,
 even if you're not in a level.

SVN r3618 (trunk)
---
 src/win32/i_mouse.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/win32/i_mouse.cpp b/src/win32/i_mouse.cpp
index 4ed347234e..e758655d31 100644
--- a/src/win32/i_mouse.cpp
+++ b/src/win32/i_mouse.cpp
@@ -267,12 +267,19 @@ void I_CheckNativeMouse(bool preferNative)
 	}
 	else
 	{
-		want_native =
-			(GetForegroundWindow() != Window) ||
-			preferNative ||
-			!use_mouse ||
-				((!m_use_mouse || menuactive != MENU_WaitKey) &&
+		if ((GetForegroundWindow() != Window) || preferNative || !use_mouse)
+		{
+			want_native = true;
+		}
+		else if (menuactive == MENU_WaitKey)
+		{
+			want_native = false;
+		}
+		else
+		{
+			want_native = ((!m_use_mouse || menuactive != MENU_WaitKey) &&
 				(!CaptureMode_InGame() || GUICapture ||	paused || demoplayback));
+		}
 	}
 
 	//Printf ("%d %d %d\n", wantNative, preferNative, NativeMouse);