Merge branch 'develop' into feature/package

fyne-io · Jan 15, 2019 · 79a0635 · 79a0635
2 parents 034e461 + b68bd7d
commit 79a0635
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/app.go b/app/app.go
@@ -5,6 +5,7 @@ package app // import "fyne.io/fyne/app"
 
 import (
 	"os"
+	"sync"
 
 	"fyne.io/fyne"
 	"fyne.io/fyne/theme"
@@ -17,6 +18,7 @@ type fyneApp struct {
 
 	settings fyne.Settings
 	running  bool
+	runMutex sync.Mutex
 }
 
 func (app *fyneApp) Icon() fyne.Resource {
@@ -32,11 +34,16 @@ func (app *fyneApp) NewWindow(title string) fyne.Window {
 }
 
 func (app *fyneApp) Run() {
+	app.runMutex.Lock()
+
 	if app.running {
+		app.runMutex.Unlock()
 		return
 	}
 
 	app.running = true
+	app.runMutex.Unlock()
+
 	app.driver.Run()
 }