Bug 1804: Failure while closing application and suspending computer after operation completion

https://winscp.net/tracker/1804

Source commit: 6b03037f5fcb8790a72377d90346234341e4d7ba

source/forms/CustomScpExplorer.cpp

@@ -162,6 +162,7 @@ __fastcall TCustomScpExplorerForm::TCustomScpExplorerForm(TComponent* Owner):
     FFormRestored(false),
     TForm(Owner)
 {
+  FInvalid = false;
   FCurrentSide = osRemote;
   FEverShown = false;
   FDocks = new TList();
@@ -288,6 +289,7 @@ __fastcall TCustomScpExplorerForm::TCustomScpExplorerForm(TComponent* Owner):
 //---------------------------------------------------------------------------
 __fastcall TCustomScpExplorerForm::~TCustomScpExplorerForm()
 {
+  FInvalid = true;
   // this has to be one of the very first things to do
   StopUpdateThread();
   // This is needed when shuting down Windows only. Otherwise it's already set NULL from Execute()
@@ -8911,9 +8913,13 @@ void __fastcall TCustomScpExplorerForm::QueueSplitterDblClick(TObject * /*Sender
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::WMWinIniChange(TMessage & Message)
 {
-  WinConfiguration->ResetSysDarkTheme();
-  ConfigurationChanged();
-  ConfigureInterface();
+  // Do not handle, when shutting down anyway (maybe also when not setup completelly yet?)
+  if (FInvalid)
+  {
+    WinConfiguration->ResetSysDarkTheme();
+    ConfigurationChanged();
+    ConfigureInterface();
+  }
   TForm::Dispatch(&Message);
 }
 //---------------------------------------------------------------------------

source/forms/CustomScpExplorer.h

@@ -280,6 +280,7 @@ private:
   bool FNeedSession;
   TTerminal * FFileFindTerminal;
   UnicodeString FFileColorsCurrent;
+  bool FInvalid;
 
   bool __fastcall GetEnableFocusedOperation(TOperationSide Side, int FilesOnly);
   bool __fastcall GetEnableSelectedOperation(TOperationSide Side, int FilesOnly);