michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: wrong work tree file path

Browse source
This commit is contained in:
leo 2024-03-28 09:34:08 +08:00
parent 6950055f24
commit 223467480f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/SourceGit/ViewModels/DiffContext.cs
View file

@ -3,6 +3,7 @@ using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Avalonia; using Avalonia;
using Avalonia.Media.Imaging;
using Avalonia.Threading; using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
@ -105,8 +106,9 @@ namespace SourceGit.ViewModels
} }
else else
{ {
var fullPath = Path.Combine(repo, _option.Path);
imgDiff.Old = Commands.GetImageFileAsBitmap.Run(repo, "HEAD", oldPath); imgDiff.Old = Commands.GetImageFileAsBitmap.Run(repo, "HEAD", oldPath);
imgDiff.New = File.Exists(_option.Path) ? new Avalonia.Media.Imaging.Bitmap(_option.Path) : null; imgDiff.New = File.Exists(fullPath) ? new Bitmap(fullPath) : null;
} }
rs = imgDiff; rs = imgDiff;
} }
@ -120,8 +122,9 @@ namespace SourceGit.ViewModels
} }
else else
{ {
var fullPath = Path.Combine(repo, _option.Path);
binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, "HEAD").Result(); binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, "HEAD").Result();
binaryDiff.NewSize = new FileInfo(Path.Combine(repo, _option.Path)).Length; binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
} }
rs = binaryDiff; rs = binaryDiff;
} }