From 4fcd64d2c11219f8f2719048a1e3a9a3e562c9e2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 9 Jun 2009 07:57:21 +0000
Subject: [PATCH] - Fixed: I_ShutdownInput must NULL all pointers because it
 can be called twice   if an ENDOOM screen is displayed.

SVN r1660 (trunk)
---
 docs/rh-log.txt       | 2 ++
 src/win32/i_input.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 2f7183785..31ba7c94f 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 June 9, 2009  (Changes by Graf Zahl)
+- Fixed: I_ShutdownInput must NULL all pointers because it can be called twice
+  if an ENDOOM screen is displayed.
 - Fixed: R_DrawSkyStriped used frontyScale without initializing it first.
 - Fixed: P_LineAttack may not check the puff actor for MF6_FORCEPAIN because
   it's not necessarily spawned yet. 
diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
index f23248f12..cc345bbce 100644
--- a/src/win32/i_input.cpp
+++ b/src/win32/i_input.cpp
@@ -1184,10 +1184,12 @@ void I_ShutdownInput ()
 	if (Keyboard != NULL)
 	{
 		delete Keyboard;
+		Keyboard = NULL;
 	}
 	if (Mouse != NULL)
 	{
 		delete Mouse;
+		Mouse = NULL;
 	}
 	if (g_pJoy)
 	{