Guard for nil when closing windows

Fixes: #3870
fyne-io · May 9, 2023 · 4b01822 · 4b01822
1 parent ec0d80e
commit 4b01822
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/internal/driver/glfw/window_desktop.go b/internal/driver/glfw/window_desktop.go
@@ -318,7 +318,9 @@ func (w *window) refresh(_ *glfw.Window) {
 }
 
 func (w *window) closed(viewport *glfw.Window) {
-	viewport.SetShouldClose(false) // reset the closed flag until we check the veto in processClosed
+	if viewport != nil {
+		viewport.SetShouldClose(false) // reset the closed flag until we check the veto in processClosed
+	}
 
 	w.processClosed()
 }

diff --git a/internal/driver/glfw/window_test.go b/internal/driver/glfw/window_test.go
@@ -1720,6 +1720,12 @@ func TestWindow_CloseInterception(t *testing.T) {
 	})
 }
 
+func TestWindow_ClosedBeforeShow(t *testing.T) {
+	w := createWindow("Test").(*window)
+	// viewport will be nil if window is closed before show
+	assert.NotPanics(t, func() { w.closed(nil) })
+}
+
 func TestWindow_SetContent_Twice(t *testing.T) {
 	w := createWindow("Test").(*window)