opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Decide to store settings value even when it's equal to the default value we hold in TAppSetting.Default[Int|String|Bool]. This is important when AppSettings.Read() gets a default value passed, e.g. SynSQLSyn1.Attribute[i].IntegerStyle. Fixes issue #3032.

Browse Source
This commit is contained in:
Ansgar Becker
2012-12-04 20:35:51 +00:00
parent d97b033731
commit cea47f7087
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/helpers.pas
View File

@ -3458,7 +3458,7 @@ procedure TAppSettings.Write(Index: TAppSettingIndex; FormatName: String;
DataType: TAppSettingDataType; I: Integer; B: Boolean; S: String);
var
ValueName: String;
SameAsDefault, SameAsCurrent: Boolean;
SameAsCurrent: Boolean;
begin
// Write user setting value to registry
ValueName := FSettings[Index].Name;
@ -3471,27 +3471,24 @@ begin
PrepareRegistry;
case DataType of
adInt: begin
SameAsDefault := I = FSettings[Index].DefaultInt;
SameAsCurrent := FSettings[Index].Synced and (I = FSettings[Index].CurrentInt);
if (not SameAsDefault) and (not SameAsCurrent) then begin
if not SameAsCurrent then begin
FRegistry.WriteInteger(ValueName, I);
Inc(FWrites);
end;
FSettings[Index].CurrentInt := I;
end;
adBool: begin
SameAsDefault := B = FSettings[Index].DefaultBool;
SameAsCurrent := FSettings[Index].Synced and (B = FSettings[Index].CurrentBool);
if (not SameAsDefault) and (not SameAsCurrent) then begin
if not SameAsCurrent then begin
FRegistry.WriteBool(ValueName, B);
Inc(FWrites);
end;
FSettings[Index].CurrentBool := B;
end;
adString: begin
SameAsDefault := S = FSettings[Index].DefaultString;
SameAsCurrent := FSettings[Index].Synced and (S = FSettings[Index].CurrentString);
if (not SameAsDefault) and (not SameAsCurrent) then begin
if not SameAsCurrent then begin
FRegistry.WriteString(ValueName, S);
Inc(FWrites);
end;
@ -3500,8 +3497,6 @@ begin
else
raise Exception.CreateFmt(_(SUnsupportedSettingsDatatype), [FSettings[Index].Name]);
end;
if SameAsDefault and FRegistry.ValueExists(ValueName) then
FRegistry.DeleteValue(ValueName);
if (FormatName = '') and (FSessionPath = '') then
FSettings[Index].Synced := True;
end;