From 54e376ebbe0948d23b8d199a1a0dd01544b3344b Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sat, 12 Dec 2009 11:34:32 +0000
Subject: [PATCH] Make sure the Game_wind always gets freed when exiting the
 game screen, fixing flashing automap and framerate reduction after playing
 demos

---
 CHANGELOG.txt | 4 ++++
 main/game.c   | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e5098fbf8..8cc39b1d6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20091212
+--------
+main/game.c: Make sure the Game_wind always gets freed when exiting the game screen, fixing flashing automap and framerate reduction after playing demos
+
 20091211
 --------
 arch/linux/ukali.c: Fixing possible string overflow while using KALI_PROCESS_NAME
diff --git a/main/game.c b/main/game.c
index ade79ba99..e2ab03a3c 100644
--- a/main/game.c
+++ b/main/game.c
@@ -1057,10 +1057,7 @@ int game_handler(window *wind, d_event *event, void *data)
 	}
 	
 	if (Function_mode != FMODE_GAME)
-	{
-		if (window_close(wind))
-			longjmp(LeaveGame,0);
-	}
+		longjmp(LeaveGame,0);
 
 	return 1;
 }
@@ -1080,6 +1077,7 @@ void game()
 			event_process();
 	}
 
+	window_close(wind);
 	digi_stop_all();
 
 	if ( (Newdemo_state == ND_STATE_RECORDING) || (Newdemo_state == ND_STATE_PAUSED) )