Merge pull request #1133 from andydotxyz/fix/1107

Fix/1107
fyne-io · Jun 28, 2020 · 194fc80 · 194fc80
2 parents 7f83254 + 6ebfe0a
commit 194fc80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/internal/driver/glfw/driver.go b/internal/driver/glfw/driver.go
@@ -92,7 +92,7 @@ func (d *gLDriver) focusPreviousWindow() {
 		}
 	}
 
-	if chosen == nil {
+	if chosen == nil || chosen.(*window).view() == nil {
 		return
 	}
 	chosen.RequestFocus()

diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -340,6 +340,9 @@ func (w *window) doShow() {
 		time.Sleep(time.Millisecond * 10)
 	}
 	w.createLock.Do(w.create)
+	if w.view() == nil {
+		return
+	}
 
 	runOnMain(func() {
 		w.viewLock.Lock()