|
@@ -1302,7 +1302,7 @@ begin
|
|
{ Log page }
|
|
{ Log page }
|
|
gLogFile := False;
|
|
gLogFile := False;
|
|
gLogFileWithDateInName := FALSE;
|
|
gLogFileWithDateInName := FALSE;
|
|
- gLogFileName := gpCfgDir + 'doublecmd.log';
|
|
|
|
|
|
+ gLogFileName := EnvVarConfigPath + PathDelim + 'doublecmd.log';
|
|
gLogOptions := [log_cp_mv_ln, log_delete, log_dir_op, log_arc_op,
|
|
gLogOptions := [log_cp_mv_ln, log_delete, log_dir_op, log_arc_op,
|
|
log_vfs_op, log_success, log_errors, log_info,
|
|
log_vfs_op, log_success, log_errors, log_info,
|
|
log_start_shutdown, log_commandlineexecution];
|
|
log_start_shutdown, log_commandlineexecution];
|
|
@@ -1359,7 +1359,7 @@ begin
|
|
|
|
|
|
{ Ignore list page }
|
|
{ Ignore list page }
|
|
gIgnoreListFileEnabled := False;
|
|
gIgnoreListFileEnabled := False;
|
|
- gIgnoreListFile := gpCfgDir + 'ignorelist.txt';
|
|
|
|
|
|
+ gIgnoreListFile := EnvVarConfigPath + PathDelim + 'ignorelist.txt';
|
|
|
|
|
|
{Viewer}
|
|
{Viewer}
|
|
gImageStretch := False;
|
|
gImageStretch := False;
|
|
@@ -1887,7 +1887,7 @@ var
|
|
{ Log }
|
|
{ Log }
|
|
gLogFile := gIni.ReadBool('Configuration', 'LogFile', True);
|
|
gLogFile := gIni.ReadBool('Configuration', 'LogFile', True);
|
|
gLogFileWithDateInName := gIni. ReadBool('Configuration', 'LogFileWithDateInName', FALSE);
|
|
gLogFileWithDateInName := gIni. ReadBool('Configuration', 'LogFileWithDateInName', FALSE);
|
|
- gLogFileName := gIni.ReadString('Configuration', 'LogFileName', gpCfgDir + 'doublecmd.log');
|
|
|
|
|
|
+ gLogFileName := gIni.ReadString('Configuration', 'LogFileName', gLogFileName);
|
|
gLogOptions := TLogOptions(gIni.ReadInteger('Configuration', 'LogOptions', Integer(gLogOptions)));
|
|
gLogOptions := TLogOptions(gIni.ReadInteger('Configuration', 'LogOptions', Integer(gLogOptions)));
|
|
{ Configuration page }
|
|
{ Configuration page }
|
|
gSaveDirHistory := gIni.ReadBool('Configuration', 'SaveDirHistory', True);
|
|
gSaveDirHistory := gIni.ReadBool('Configuration', 'SaveDirHistory', True);
|
|
@@ -1924,7 +1924,7 @@ var
|
|
gCustomDriveIcons := gIni.ReadBool('Configuration', 'CustomDriveIcons', False);
|
|
gCustomDriveIcons := gIni.ReadBool('Configuration', 'CustomDriveIcons', False);
|
|
{ Ignore list page }
|
|
{ Ignore list page }
|
|
gIgnoreListFileEnabled:= gIni.ReadBool('Configuration', 'IgnoreListFileEnabled', False);
|
|
gIgnoreListFileEnabled:= gIni.ReadBool('Configuration', 'IgnoreListFileEnabled', False);
|
|
- gIgnoreListFile:= gIni.ReadString('Configuration', 'IgnoreListFile', gpCfgDir + 'ignorelist.txt');
|
|
|
|
|
|
+ gIgnoreListFile:= gIni.ReadString('Configuration', 'IgnoreListFile', gIgnoreListFile);
|
|
|
|
|
|
gCutTextToColWidth := gIni.ReadBool('Configuration', 'CutTextToColWidth', True);
|
|
gCutTextToColWidth := gIni.ReadBool('Configuration', 'CutTextToColWidth', True);
|
|
|
|
|