forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, checkout from menu item caption broken 

caused by 87218256b6
This commit is contained in:
Basile Burg 2020-07-08 13:25:23 +02:00
parent 87218256b6
commit 1001642f88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/u_main.pas
View File

@ -4146,7 +4146,7 @@ begin
exit; exit;
p := TProcess.Create(nil); p := TProcess.Create(nil);
r := TStringList.Create; r := TStringList.Create;
b := TMenuItem(sender).Caption; b := TMenuItem(sender).Hint;
try try
p.Executable := exeFullName('git' + exeExt); p.Executable := exeFullName('git' + exeExt);
if p.Executable.fileExists then if p.Executable.fileExists then
@ -4222,18 +4222,18 @@ begin
m.OnClick:= @gitBranchMenuItemClick; m.OnClick:= @gitBranchMenuItemClick;
if r[i][1] = '*' then if r[i][1] = '*' then
begin begin
m.Caption:= Trim(r[i][2..r[i].length]); m.Hint:= Trim(r[i][2..r[i].length]);
m.Checked:= true; m.Checked:= true;
end end
else m.Caption:= Trim(r[i][1..r[i].length]); else m.Hint:= Trim(r[i][1..r[i].length]);
c.Clear; c.Clear;
p.Parameters.Delete(4); p.Parameters.Delete(4);
p.Parameters.AddStrings(m.Caption); p.Parameters.AddStrings(m.Hint);
p.Execute(); p.Execute();
processOutputToStrings(p, c); processOutputToStrings(p, c);
while p.Running do ; while p.Running do ;
if not c.Count.equals(0) then if not c.Count.equals(0) then
m.caption := m.caption + ' [last commit: ' + c[0] + ' ]'; m.caption := m.Hint + ' [last commit: ' + c[0] + ' ]';
mnuGitBranch.Add(m); mnuGitBranch.Add(m);
end; end;
end; end;