mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-16 13:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show proper error message in diff when failing to load image

Browse Source
This commit is contained in:
Kovid Goyal
2023-05-24 22:47:14 +05:30
parent 5b199b28c3
commit 5e6d020275
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/diff/render.go
View File

@@ -362,7 +362,7 @@ func image_lines(left_path, right_path string, screen_size screen_size, margin_s
if errors.Is(err, graphics.ErrNotFound) { if errors.Is(err, graphics.ErrNotFound) {
return splitlines("Loading image...", available_cols) return splitlines("Loading image...", available_cols)
} }
return splitlines(fmt.Sprintf("Failed to load image: %s", err), available_cols) return splitlines(fmt.Sprintf("%s", err), available_cols)
} }
left_lines := do_side(left_path) left_lines := do_side(left_path)
if ll.left_image.count = len(left_lines); ll.left_image.count > 0 { if ll.left_image.count = len(left_lines); ll.left_image.count > 0 {

3
tools/tui/graphics/collection.go
View File

@@ -86,6 +86,9 @@ func (self *ImageCollection) GetSizeIfAvailable(key string, page_size Size) (Siz
} }
ans := img.renderings[page_size] ans := img.renderings[page_size]
if ans == nil { if ans == nil {
if img.err != nil {
return Size{}, img.err
}
return Size{}, ErrNotFound return Size{}, ErrNotFound
} }
return Size{ans.img.Width, ans.img.Height}, img.err return Size{ans.img.Width, ans.img.Height}, img.err