Don't crash if no image is loaded

fyne-io · Mar 2, 2020 · 7b75ee4 · 7b75ee4
1 parent 92262b1
commit 7b75ee4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/internal/ui/editor.go b/internal/ui/editor.go
@@ -90,6 +90,9 @@ func (e *editor) draw(w, h int) image.Image {
 }
 
 func (e *editor) updateSizes() {
+	if e.img == nil {
+		return
+	}
 	e.cacheWidth = e.img.Bounds().Dx() * e.zoom
 	e.cacheHeight = e.img.Bounds().Dy() * e.zoom
 

diff --git a/internal/ui/raster.go b/internal/ui/raster.go
@@ -40,7 +40,7 @@ func (r *interactiveRaster) CreateRenderer() fyne.WidgetRenderer {
 }
 
 func (r *interactiveRaster) Tapped(ev *fyne.PointEvent) {
-	if r.edit.tool == nil {
+	if r.edit.tool == nil || r.edit.img == nil {
 		return
 	}