a

cache.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"errors"
 )
 
 // global or app-level map/cache
@@ -46,7 +47,11 @@ func getTexture(path string) (gdk.Paintabler, error) {
 		return nil, err
 	}
 	textureCache.Store(path, tex)
-	return tex.(gdk.Paintabler), nil
+	t, ok := tex.(gdk.Paintabler)
+	if !ok {
+		return nil, errors.New("invalid type")
+	}
+	return t, nil
 }
 
 func newPictureFromPath(path string) (*gtk.Picture, error) {
@@ -63,8 +68,7 @@ func newImageFromPath(path string) (*gtk.Image, error) {
 	if err != nil {
 		return nil, err
 	}
-	img := gtk.NewImageFromPaintable(tex)
-	return img, nil
+	return gtk.NewImageFromPaintable(tex), nil
 }
 
 func newPictureFromWeb(url string) (*gtk.Picture, error) {