mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: uuniqueinstance: function GetNextServername moved inside procedure InitInstanceWithName(); without this, project doesn't build on Windows

Browse source
This commit is contained in:
Dmitry Frank 2014-06-18 11:17:20 +00:00
commit 27c3df25de
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/platform/uuniqueinstance.pas
View file

@ -51,7 +51,6 @@ type
procedure InitInstance;
procedure InitInstanceWithName(aInstanceName: String);
function IsUniqueInstance: Boolean;
function GetNextServername(CurServername: String): String;
function WantsToBeClient: Boolean;
{en
@ -83,30 +82,6 @@ type
add a trailing number '2'; otherwise increase existing number
and return resulting string.
}
function GetNextServername(CurServername: String): String;
var
SNameRegExp: TRegExpr;
CurNumber: Integer;
begin
SNameRegExp := TRegExpr.Create();
try
SNameRegExp.Expression := '(\d+)$';
if SNameRegExp.Exec(CurServername) then
begin
//-- there is existing trailing number, so, increase it by 1
CurNumber := StrToInt(SNameRegExp.Match[1]) + 1;
Result := ReplaceRegExpr(SNameRegExp.Expression, CurServername, IntToStr(CurNumber), False);
end
else
//-- there is no trailing number, so, add a trailing number '2'
Result := CurServername + '2';
finally
SNameRegExp.Free;
end;
end;
function PeekMessage(Parameter: Pointer): PtrInt;
var
UnixIPC: TUnixIPCServer absolute Parameter;
@ -349,6 +324,31 @@ TODO: implement 'servername', for example, similar to Vim's implementation.
then we should add a trailing number to the servername.
}
procedure InitInstanceWithName(aInstanceName: String);
function GetNextServername(CurServername: String): String;
var
SNameRegExp: TRegExpr;
CurNumber: Integer;
begin
SNameRegExp := TRegExpr.Create();
try
SNameRegExp.Expression := '(\d+)$';
if SNameRegExp.Exec(CurServername) then
begin
//-- there is existing trailing number, so, increase it by 1
CurNumber := StrToInt(SNameRegExp.Match[1]) + 1;
Result := ReplaceRegExpr(SNameRegExp.Expression, CurServername, IntToStr(CurNumber), False);
end
else
//-- there is no trailing number, so, add a trailing number '2'
Result := CurServername + '2';
finally
SNameRegExp.Free;
end;
end;
var
ServernameByUser: String;
begin