opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: flashing main form in background after cancel session manager

Browse Source 
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.
This commit is contained in:
Ansgar Becker
2025-12-02 20:53:24 +01:00
parent cf9ed85900
commit 0563b4d683
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/main.pas
View File

@@ -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