Merge pull request #5421 from Jacalz/clear-pending-ops-after-start

fyne-io · Jan 16, 2025 · 334b6b4 · 334b6b4
2 parents 5a4731e + aa18bf7
commit 334b6b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/driver/glfw/window_desktop.go b/internal/driver/glfw/window_desktop.go
@@ -789,6 +789,7 @@ func (w *window) create() {
 	for _, fn := range w.pending {
 		fn()
 	}
+	w.pending = nil
 
 	if w.FixedSize() && (w.requestedWidth == 0 || w.requestedHeight == 0) {
 		bigEnough := w.canvas.canvasSize(w.canvas.Content().MinSize())

diff --git a/internal/driver/glfw/window_test.go b/internal/driver/glfw/window_test.go
@@ -1746,9 +1746,8 @@ func TestWindow_SetContent_Twice(t *testing.T) {
 }
 
 func TestWindow_SetFullScreen(t *testing.T) {
-	var w *window
 	runOnMain(func() { // tests launch in a different context
-		w = d.CreateWindow("Full").(*window)
+		w := d.CreateWindow("Full").(*window)
 		w.SetFullScreen(true)
 		w.create()