really ensure that GLFW is only initialised once

toaster · Apr 5, 2020 · 371e12d · 371e12d
1 parent d1f287c
commit 371e12d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/internal/driver/glfw/loop.go b/internal/driver/glfw/loop.go
@@ -22,6 +22,7 @@ type funcData struct {
 var funcQueue = make(chan funcData)
 var runFlag = false
 var runMutex = &sync.Mutex{}
+var initOnce = &sync.Once{}
 
 // Arrange that main.main runs on main thread.
 func init() {
@@ -49,13 +50,15 @@ func runOnMain(f func()) {
 }
 
 func (d *gLDriver) initGLFW() {
-	err := glfw.Init()
-	if err != nil {
-		fyne.LogError("failed to initialise GLFW", err)
-		return
-	}
+	initOnce.Do(func() {
+		err := glfw.Init()
+		if err != nil {
+			fyne.LogError("failed to initialise GLFW", err)
+			return
+		}
 
-	initCursors()
+		initCursors()
+	})
 }
 
 func (d *gLDriver) tryPollEvents() {

diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -29,7 +29,6 @@ const (
 
 var (
 	cursorMap    map[desktop.Cursor]*glfw.Cursor
-	initOnce     = &sync.Once{}
 	defaultTitle = "Fyne Application"
 )
 
@@ -1096,7 +1095,7 @@ func (d *gLDriver) createWindow(title string, decorate bool) fyne.Window {
 		title = defaultTitle
 	}
 	runOnMain(func() {
-		initOnce.Do(d.initGLFW)
+		d.initGLFW()
 
 		// make the window hidden, we will set it up and then show it later
 		glfw.WindowHint(glfw.Visible, 0)