From 0563b4d683180a7baa7f15d9f53a062b236bc1e4 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 2 Dec 2025 20:53:24 +0100
Subject: [PATCH] fix: flashing main form in background after cancel session
 manager

Decided to fully show the main form before showing the session manager through an Application.OnIdle event. Hoping no user manages to click somewhere on the main form, causing crashes. The only reasonable alternative was to show the session manager before TMainForm is created, but this would be more effort.
---
 source/main.pas | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 6c33c842..5529915d 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1408,6 +1408,7 @@ var
   SysLanguage: String;
   MainFormCreated: Boolean = False;
   MainFormAfterCreateDone: Boolean = False;
+  SessionManagerStartupDone: Boolean = False;
   PostponedLogItems: TDBLogItems;
 
 const
@@ -2167,9 +2168,7 @@ var
   StatsCall: THttpDownload;
   StatsURL: String;
   SessionPaths: TStringlist;
-  DlgResult: TModalResult;
   Tab: TQueryTab;
-  SessionManager: TConnForm;
 begin
   // Check for connection parameters on commandline or show connections form.
   if AppSettings.ReadBool(asUpdatecheck) then begin
@@ -2281,25 +2280,6 @@ begin
     end;
   end;
 
-  // Display session manager
-  if Connections.Count = 0 then begin
-    // Cannot be done in OnCreate because we need ready forms here:
-    SessionManager := TConnForm.Create(Self);
-    DlgResult := mrCancel;
-    try
-      DlgResult := SessionManager.ShowModal;
-      SessionManager.Free;
-    except
-      // Work around VCL bug: Suppress access violation in TCustomForm.IsFormSizeStored
-      // when closing dialog via Alt+F4
-    end;
-    if DlgResult = mrCancel then begin
-      //Free;
-      //Exit;
-      actExitApplicationExecute(nil);
-    end;
-  end;
-
   // Restore backup'ed query tabs
   if AppSettings.RestoreTabsInitValue then begin
     TimerStoreTabs.Enabled := RestoreTabs;
@@ -14608,7 +14588,23 @@ end;
 
 
 procedure TMainForm.ApplicationIdle(Sender: TObject; var Done: Boolean);
+var
+  DlgResult: TModalResult;
+  SessionManager: TConnForm;
 begin
+  // Display session manager
+  // Cannot be done in OnCreate because we need ready forms here
+  if (not SessionManagerStartupDone) and (Connections.Count = 0) then begin
+    SessionManagerStartupDone := True;
+    SessionManager := TConnForm.Create(Self);
+    DlgResult := SessionManager.ShowModal;
+    SessionManager.Free;
+    if DlgResult = mrCancel then begin
+      actExitApplicationExecute(nil);
+    end;
+  end;
+  SessionManagerStartupDone := True;
+
   if AppSettings.PortableMode
     and (not AppSettings.PortableModeReadOnly)
     and (FLastPortableSettingsSave < GetTickCount-60000) then begin