Better error handling for background load errors

FyshOS · Mar 18, 2024 · 2133ce0 · 2133ce0
1 parent 7bc2c75
commit 2133ce0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/internal/ui/background.go b/internal/ui/background.go
@@ -42,7 +42,7 @@ func (b *background) loadModules() []fyne.CanvasObject {
 
 func (b *background) updateBackground(path string) {
 	_, err := os.Stat(path)
-	if path == "" || os.IsNotExist(err) {
+	if path == "" || err != nil {
 		set := fyne.CurrentApp().Settings()
 		src := &builtin.Builtin{}
 		b.wallpaper.Objects[0] = src.Load(set.Theme(), set.ThemeVariant())

diff --git a/internal/x11/wm/desk.go b/internal/x11/wm/desk.go
@@ -850,14 +850,15 @@ func (x *x11WM) updatedBackgroundImage(w, h int) image.Image {
 		file, err := os.Open(path)
 		if err != nil {
 			fyne.LogError("Failed to open background image", err)
+		} else {
+			img, _, err := image.Decode(file)
+			if err != nil {
+				fyne.LogError("Failed to read background image", err)
+			} else {
+				_ = file.Close()
+				return resize.Resize(uint(w), uint(h), img, resize.Lanczos3)
+			}
 		}
-		img, _, err := image.Decode(file)
-		if err != nil {
-			fyne.LogError("Failed to read background image", err)
-		}
-		_ = file.Close()
-
-		return resize.Resize(uint(w), uint(h), img, resize.Lanczos3)
 	}
 
 	set := fyne.CurrentApp().Settings()