diff --git a/source/apphelpers.pas b/source/apphelpers.pas index d87a1ff9..4f3390cf 100644 --- a/source/apphelpers.pas +++ b/source/apphelpers.pas @@ -214,6 +214,7 @@ type FRestoreTabsInitValue: Boolean; FSettingsFile: String; FSettings: Array[TAppSettingIndex] of TAppSetting; + const FPortableLockFileBase: String='portable.lock'; procedure InitSetting(Index: TAppSettingIndex; Name: String; DefaultInt: Integer=0; DefaultBool: Boolean=False; DefaultString: String=''; Session: Boolean=False); @@ -3399,7 +3400,7 @@ begin FReads := 0; FWrites := 0; - PortableLockFile := ExtractFilePath(ParamStr(0)) + SPortableLockFile; + PortableLockFile := ExtractFilePath(ParamStr(0)) + FPortableLockFileBase; // Use filename from command line. If not given, use file in directory of executable. rx := TRegExpr.Create; diff --git a/source/const.inc b/source/const.inc index df71c775..53272c3f 100644 --- a/source/const.inc +++ b/source/const.inc @@ -101,7 +101,6 @@ const MsgUnhandledNetType: String = 'Unhandled connection type (%d)'; MsgDisconnect: String = 'Connection to %s closed at %s'; MsgInvalidColumn: String = 'Column #%d not available. Query returned %d columns and %d rows.'; - SPortableLockFile: String = 'portable.lock'; FILEFILTER_SQLITEDB = '*.sqlite3;*.sqlite;*.db;*.s3db'; FILEEXT_SQLITEDB = 'sqlite3';