From 5e6d0202752d66ddee9bd609597839922e44e01a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 May 2023 22:47:14 +0530
Subject: [PATCH] Show proper error message in diff when failing to load image

---
 kittens/diff/render.go           | 2 +-
 tools/tui/graphics/collection.go | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kittens/diff/render.go b/kittens/diff/render.go
index ff6239ba7..81aa9295b 100644
--- a/kittens/diff/render.go
+++ b/kittens/diff/render.go
@@ -362,7 +362,7 @@ func image_lines(left_path, right_path string, screen_size screen_size, margin_s
 		if errors.Is(err, graphics.ErrNotFound) {
 			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)
 	if ll.left_image.count = len(left_lines); ll.left_image.count > 0 {
diff --git a/tools/tui/graphics/collection.go b/tools/tui/graphics/collection.go
index 2a54cc269..ed6284108 100644
--- a/tools/tui/graphics/collection.go
+++ b/tools/tui/graphics/collection.go
@@ -86,6 +86,9 @@ func (self *ImageCollection) GetSizeIfAvailable(key string, page_size Size) (Siz
 	}
 	ans := img.renderings[page_size]
 	if ans == nil {
+		if img.err != nil {
+			return Size{}, img.err
+		}
 		return Size{}, ErrNotFound
 	}
 	return Size{ans.img.Width, ans.img.Height}, img.err