From d52e9d7b6bcc5c1846c82c3908a4688339e736f3 Mon Sep 17 00:00:00 2001
From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Mon, 20 Feb 2023 21:07:19 +0300
Subject: [PATCH] gui: close menu before show loadscreen
---
src/game/g_window.pas | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 92ee3b9..df97e51 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -32,11 +32,17 @@ implementation
{$IFDEF ENABLE_SYSTEM}
g_system,
{$ENDIF}
+ {$IFDEF ENABLE_MENU}
+ g_gui,
+ {$ENDIF}
e_sound, g_net
;
procedure ProcessLoading (forceUpdate: Boolean = False);
begin
+ {$IFDEF ENABLE_MENU}
+ g_ActiveWindow := nil;
+ {$ENDIF}
{$IFDEF ENABLE_RENDER}
r_Render_DrawLoading(forceUpdate);
{$ENDIF}
@@ -44,6 +50,9 @@ implementation
procedure g_Game_ClearLoading;
begin
+ {$IFDEF ENABLE_MENU}
+ g_ActiveWindow := nil;
+ {$ENDIF}
{$IFDEF ENABLE_RENDER}
r_Render_ClearLoading;
{$ENDIF}
@@ -51,6 +60,9 @@ implementation
procedure g_Game_SetLoadingText (const text: String; maxval: Integer; rewrite: Boolean);
begin
+ {$IFDEF ENABLE_MENU}
+ g_ActiveWindow := nil;
+ {$ENDIF}
{$IFDEF ENABLE_RENDER}
if maxval < 0 then maxval := 0;
r_Render_SetLoading(text, maxval);
@@ -59,6 +71,9 @@ implementation
procedure g_Game_StepLoading (value: Integer = -1);
begin
+ {$IFDEF ENABLE_MENU}
+ g_ActiveWindow := nil;
+ {$ENDIF}
{$IFDEF ENABLE_RENDER}
if value < 0 then value := 1;
r_Render_StepLoading(value);
--
2.29.2