From 6a812736451ba1522ca475d9b34b0ea589cb2627 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Thu, 24 Jun 2010 14:00:01 +0000
Subject: [PATCH] When inregulary exiting a level by warp cheat, set canvas to
 NULL so cockpit canvas will not apply furthermore

---
 CHANGELOG.txt   | 1 +
 main/gamecntl.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0742d9a91..574410e2e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20100624
 --------
 arch/ogl/gr.c, arch/sdl/gr.c, include/gr.h, main/menu.c: Added function to list valid resolutions and build resolutions menu dynamically with the resulting list
+main/gamecntl.c: When inregulary exiting a level by warp cheat, set canvas to NULL so cockpit canvas will not apply furthermore
 
 20100623
 --------
diff --git a/main/gamecntl.c b/main/gamecntl.c
index 86e4b92b0..c60b55b43 100644
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -1723,6 +1723,7 @@ void FinalCheats(int key)
 		if (item != -1) {
 			new_level_num = atoi(m.text);
 			if (new_level_num!=0 && new_level_num>=0 && new_level_num<=Last_level) {
+				gr_set_current_canvas(NULL); // get out of cockpit canvas
 				StartNewLevel(new_level_num, 0);
 				do_cheat_penalty();
 			}