Merge pull request #4177 from Jacalz/init-cleanup

fyne-io · Aug 23, 2023 · d2a24a9 · d2a24a9
2 parents 6f3bf59 + 460fa8d
commit d2a24a9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 23 deletions.
diff --git a/internal/driver/glfw/driver.go b/internal/driver/glfw/driver.go
@@ -172,9 +172,11 @@ func (d *gLDriver) Run() {
 func NewGLDriver() fyne.Driver {
 	repository.Register("file", intRepo.NewFileRepository())
 
-	return &gLDriver{
+	d := &gLDriver{
 		done:      make(chan interface{}),
 		drawDone:  make(chan interface{}),
 		animation: &animation.Runner{},
 	}
+	d.initGLFW()
+	return d
 }
diff --git a/internal/driver/glfw/loop.go b/internal/driver/glfw/loop.go
@@ -33,7 +33,6 @@ type runFlag struct {
 var funcQueue = make(chan funcData)
 var drawFuncQueue = make(chan drawData)
 var run = &runFlag{Cond: sync.Cond{L: &sync.Mutex{}}}
-var initOnce = &sync.Once{}
 
 // Arrange that main.main runs on main thread.
 func init() {
@@ -106,7 +105,6 @@ func (d *gLDriver) runGL() {
 	run.L.Unlock()
 	run.Broadcast()
 
-	d.initGLFW()
 	if d.trayStart != nil {
 		d.trayStart()
 	}

diff --git a/internal/driver/glfw/loop_desktop.go b/internal/driver/glfw/loop_desktop.go
@@ -12,16 +12,14 @@ import (
 )
 
 func (d *gLDriver) initGLFW() {
-	initOnce.Do(func() {
-		err := glfw.Init()
-		if err != nil {
-			fyne.LogError("failed to initialise GLFW", err)
-			return
-		}
-
-		initCursors()
-		d.startDrawThread()
-	})
+	err := glfw.Init()
+	if err != nil {
+		fyne.LogError("failed to initialise GLFW", err)
+		return
+	}
+
+	initCursors()
+	d.startDrawThread()
 }
 
 func (d *gLDriver) tryPollEvents() {

diff --git a/internal/driver/glfw/loop_goxjs.go b/internal/driver/glfw/loop_goxjs.go
@@ -13,15 +13,13 @@ import (
 )
 
 func (d *gLDriver) initGLFW() {
-	initOnce.Do(func() {
-		err := glfw.Init(gl.ContextWatcher)
-		if err != nil {
-			fyne.LogError("failed to initialise GLFW", err)
-			return
-		}
+	err := glfw.Init(gl.ContextWatcher)
+	if err != nil {
+		fyne.LogError("failed to initialise GLFW", err)
+		return
+	}
 
-		d.startDrawThread()
-	})
+	d.startDrawThread()
 }
 
 func (d *gLDriver) tryPollEvents() {

diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go
@@ -947,8 +947,6 @@ func (d *gLDriver) createWindow(title string, decorate bool) fyne.Window {
 		title = defaultTitle
 	}
 	runOnMain(func() {
-		d.initGLFW()
-
 		ret = &window{title: title, decorate: decorate, driver: d}
 		// This queue is destroyed when the window is closed.
 		ret.InitEventQueue()