From 9fa220634d1d99a0ca7229fabc375095fab92cef Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 22 Mar 2009 18:27:52 +0000 Subject: [PATCH] Bugfix: Press "ESC" while green progress bar on laptop loads -> Buttons are still visible although Laptop is closes (by InHuMan from Stracciatella Forum) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2630 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/laptop.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp index e460ff3a..28a94d7c 100644 --- a/Laptop/laptop.cpp +++ b/Laptop/laptop.cpp @@ -1065,6 +1065,10 @@ void ExitLaptop() { ExitLaptopMode(guiCurrentLaptopMode); } + else + { + ExitLaptopMode(guiPreviousLaptopMode); + } fExitDuringLoad = FALSE; fLoadPendingFlag = FALSE; @@ -1163,7 +1167,7 @@ void RenderLaptop() return; } - if(fLoadPendingFlag) + if(fLoadPendingFlag || fExitDuringLoad) { uiTempMode = guiCurrentLaptopMode; guiCurrentLaptopMode = guiPreviousLaptopMode;