Introduce property LogToFile in TMainForm, which is synced with the registry setting asLogToFile. Fixes issue #2936.

source/helpers.pas

@@ -3371,8 +3371,8 @@ begin
       if (not SameAsDefault) and (not SameAsCurrent) then begin
         FRegistry.WriteInteger(ValueName, I);
         Inc(FWrites);
-        FSettings[Index].CurrentInt := I;
       end;
+      FSettings[Index].CurrentInt := I;
     end;
     adBool:  begin
       SameAsDefault := B = FSettings[Index].DefaultBool;
@@ -3380,8 +3380,8 @@ begin
       if (not SameAsDefault) and (not SameAsCurrent) then begin
         FRegistry.WriteBool(ValueName, B);
         Inc(FWrites);
-        FSettings[Index].CurrentBool := B;
       end;
+      FSettings[Index].CurrentBool := B;
     end;
     adString: begin
       SameAsDefault := S = FSettings[Index].DefaultString;
@@ -3389,8 +3389,8 @@ begin
       if (not SameAsDefault) and (not SameAsCurrent) then begin
         FRegistry.WriteString(ValueName, S);
         Inc(FWrites);
-        FSettings[Index].CurrentString := S;
       end;
+      FSettings[Index].CurrentString := S;
     end;
     else
       raise Exception.CreateFmt(SUnsupportedSettingsDatatype, [FSettings[Index].Name]);

source/main.dfm

@@ -8844,6 +8844,7 @@ object MainForm: TMainForm
   end
   object popupSqlLog: TPopupMenu
     Images = ImageListMain
+    OnPopup = popupSqlLogPopup
     Left = 8
     Top = 96
     object Copy1: TMenuItem

source/main.pas

@@ -880,10 +880,12 @@ type
       var Allowed: Boolean);
     procedure actGroupObjectsExecute(Sender: TObject);
     procedure lblExplainProcessAnalyzerClick(Sender: TObject);
+    procedure popupSqlLogPopup(Sender: TObject);
   private
     FLastHintMousepos: TPoint;
     FLastHintControlIndex: Integer;
     FDelimiter: String;
+    FLogToFile: Boolean;
     FFileNameSessionLog: String;
     FFileHandleSessionLog: Textfile;
     FLastMouseUpOnPageControl: Cardinal;
@@ -949,6 +951,7 @@ type
     function TreeClickHistoryPrevious(MayBeNil: Boolean=False): PVirtualNode;
     procedure OperationRunning(Runs: Boolean);
     function RunQueryFiles(Filenames: TStrings; Encoding: TEncoding): Boolean;
+    procedure SetLogToFile(Value: Boolean);
   public
     QueryTabs: TObjectList<TQueryTab>;
     ActiveObjectEditor: TDBObjectEditor;
@@ -1003,8 +1006,7 @@ type
     property ActiveConnection: TDBConnection read GetActiveConnection;
     property ActiveDatabase: String read GetActiveDatabase;
     property ActiveDbObj: TDBObject read FActiveDbObj write SetActiveDBObj;
-    procedure ActivateFileLogging;
+    property LogToFile: Boolean read FLogToFile write SetLogToFile;
-    procedure DeactivateFileLogging;
     procedure RefreshTree(FocusNewObject: TDBObject=nil);
     function GetRootNode(Tree: TBaseVirtualTree; Connection: TDBConnection): PVirtualNode;
     function FindDBObjectNode(Tree: TBaseVirtualTree; Obj: TDBObject): PVirtualNode;
@@ -1276,9 +1278,7 @@ begin
   SaveListSetup(ListCommandStats);
   SaveListSetup(ListTables);
 
-  if AppSettings.ReadBool(asLogToFile) then
+  LogToFile := False;
-    DeactivateFileLogging;
-
   AppSettings.Free;
 end;
 
@@ -1498,8 +1498,7 @@ begin
   actDataShowNext.Hint := 'Show next '+FormatNumber(AppSettings.ReadInt(asDatagridRowsPerStep))+' rows ...';
   actAboutBox.Caption := 'About '+APPNAME+' '+AppVersion;
   // Activate logging
-  if AppSettings.ReadBool(asLogToFile) then
+  LogToFile := AppSettings.ReadBool(asLogToFile);
-    ActivateFileLogging;
   if AppSettings.ReadBool(asLogHorizontalScrollbar) then
     actLogHorizontalScrollbar.Execute;
 
@@ -4127,7 +4126,7 @@ begin
   SynMemoSQLLog.Repaint;
 
   // Log to file?
-  if AppSettings.ReadBool(asLogToFile) then
+  if FLogToFile then
   try
     Sess := '';
     if Assigned(Connection) then
@@ -4135,8 +4134,9 @@ begin
     WriteLn(FFileHandleSessionLog, Format('/* %s [%s] */ %s', [DateTimeToStr(Now), Sess, msg]));
   except
     on E:Exception do begin
-      DeactivateFileLogging;
+      LogToFile := False;
-      ErrorDialog('Error writing to session log file.', FFileNameSessionLog+CRLF+CRLF+E.Message+CRLF+CRLF+'Logging is disabled now.');
+      AppSettings.WriteBool(asLogToFile, False);
+      ErrorDialog('Error writing to session log file.', E.Message+CRLF+'Filename: '+FFileNameSessionLog+CRLF+CRLF+'Logging is disabled now.');
     end;
   end;
 end;
@@ -5318,6 +5318,15 @@ begin
   ActiveQueryMemo.SetFocus;
 end;
 
+
+procedure TMainForm.popupSqlLogPopup(Sender: TObject);
+begin
+  // Update popupMenu items
+  menuLogToFile.Checked := FLogToFile;
+  menuOpenLogFolder.Enabled := FLogToFile;
+end;
+
+
 procedure TMainForm.AutoRefreshSetInterval(Sender: TObject);
 var
   SecondsStr: String;
@@ -6399,14 +6408,15 @@ end;
   Start writing logfile.
   Called either in FormShow or after closing preferences dialog
 }
-procedure TMainForm.ActivateFileLogging;
+procedure TMainForm.SetLogToFile(Value: Boolean);
 var
   LogfilePattern, LogDir: String;
   i : Integer;
 begin
-  if AppSettings.ReadBool(asLogToFile) then
+  if Value = FLogToFile then
     Exit;
 
+  if Value then begin
     // Ensure directory exists
     LogDir := AppSettings.ReadString(asSessionLogsDirectory);
     if LogDir[Length(LogDir)] <> '\' then
@@ -6430,35 +6440,22 @@ begin
     else
       Rewrite(FFileHandleSessionLog);
     {$I+}
-  if IOResult <> 0 then
+    if IOResult <> 0 then begin
-  begin
+      AppSettings.WriteBool(asLogToFile, False);
       ErrorDialog('Error opening session log file', FFileNameSessionLog+CRLF+CRLF+'Logging is disabled now.');
-    AppSettings.WriteBool(asLogToFile, False);
+    end else begin
-  end else
+      FLogToFile := Value;
-    AppSettings.WriteBool(asLogToFile, True);
+      LogSQL('Writing to session log file now: '+FFileNameSessionLog);
-  // Update popupMenu items
+    end;
-  menuLogToFile.Checked := AppSettings.ReadBool(asLogToFile);
+  end else begin
-  menuOpenLogFolder.Enabled := AppSettings.ReadBool(asLogToFile);
-end;
-
-
-{**
-  Close logfile.
-  Called in FormClose, in ActivateFileLogging and on closing preferences dialog
-}
-procedure TMainForm.DeactivateFileLogging;
-begin
-  if not AppSettings.ReadBool(asLogToFile) then
-    Exit;
-  AppSettings.WriteBool(asLogToFile, False);
     {$I-} // Supress errors
     CloseFile(FFileHandleSessionLog);
     {$I+}
     // Reset IOResult so later checks in ActivateFileLogging doesn't get an old value
     IOResult;
-  // Update popupMenu items
+    FLogToFile := Value;
-  menuLogToFile.Checked := AppSettings.ReadBool(asLogToFile);
+    LogSQL('Writing to session log file disabled now');
-  menuOpenLogFolder.Enabled := AppSettings.ReadBool(asLogToFile);
+  end;
 end;
 
 
@@ -6505,18 +6502,11 @@ end;
   Enable/disable file logging by popupmenuclick
 }
 procedure TMainForm.menuLogToFileClick(Sender: TObject);
-var
-  WasActivated: Boolean;
 begin
-  WasActivated := AppSettings.ReadBool(asLogToFile);
+  LogToFile := not LogToFile;
-  if not WasActivated then
-    ActivateFileLogging
-  else
-    DeactivateFileLogging;
-
   // Save option
   AppSettings.ResetPath;
-  AppSettings.WriteBool(asLogToFile, not WasActivated);
+  AppSettings.WriteBool(asLogToFile, LogToFile);
 end;
 
 

source/options.pas

@@ -303,10 +303,7 @@ begin
     end;
   end;
 
-  if chkLogToFile.Checked then
+  Mainform.LogToFile := chkLogToFile.Checked;
-    Mainform.ActivateFileLogging
-  else
-    Mainform.DeactivateFileLogging;
   DatatypeCategories[dtcInteger].Color := FGridTextColors[dtcInteger];
   DatatypeCategories[dtcReal].Color := FGridTextColors[dtcReal];
   DatatypeCategories[dtcText].Color := FGridTextColors[dtcText];