From 741a56883ee8b51509af9ac9dcc59e69a63d4990 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Fri, 6 Nov 2020 10:42:01 +0000
Subject: [PATCH] LCL: Add ExitProc to TApplication differently. Issue #38039,
 patch from Cyrax.

git-svn-id: trunk@64110 -
---
 lcl/forms.pp                | 1 -
 lcl/include/application.inc | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lcl/forms.pp b/lcl/forms.pp
index e065cef415..817ae9d17c 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -1397,7 +1397,6 @@ type
     FMouseControl: TControl;
     FNavigation: TApplicationNavigationOptions;
     FOldExceptProc: TExceptProc;
-    FOldExitProc: Pointer;
     FOnActionExecute: TActionEvent;
     FOnActionUpdate: TActionEvent;
     FOnActivate: TNotifyEvent;
diff --git a/lcl/include/application.inc b/lcl/include/application.inc
index 66279d346c..18ff38c855 100644
--- a/lcl/include/application.inc
+++ b/lcl/include/application.inc
@@ -119,8 +119,7 @@ begin
   inherited Create(AOwner);
   CaptureExceptions:=true;
 
-  FOldExitProc:=ExitProc;
-  ExitProc:=@BeforeFinalization;
+  AddExitProc(@BeforeFinalization);
   
   OnGetApplicationName := @GetApplicationName;
 end;
@@ -135,8 +134,6 @@ begin
 
   if Assigned(FOnDestroy) then FOnDestroy(Self);
 
-  ExitProc:=FOldExitProc;
-
   ProcessAsyncCallQueue;
 
   if OnMenuPopupHandler=@MenuPopupHandler then