Merge branch 'develop' of github.com:fyne-io/fyne into develop

app/preferences.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"sync"
 	"time"
 
 	"fyne.io/fyne/v2"
@@ -12,6 +13,8 @@ import (
 
 type preferences struct {
 	*internal.InMemoryPreferences
+
+	prefLock     sync.RWMutex
 	ignoreChange bool
 
 	app *fyneApp
@@ -23,7 +26,9 @@ var _ fyne.Preferences = (*preferences)(nil)
 func (p *preferences) resetIgnore() {
 	go func() {
 		time.Sleep(time.Millisecond * 100) // writes are not always atomic. 10ms worked, 100 is safer.
+		p.prefLock.Lock()
 		p.ignoreChange = false
+		p.prefLock.Unlock()
 	}()
 }
 
@@ -32,7 +37,9 @@ func (p *preferences) save() error {
 }
 
 func (p *preferences) saveToFile(path string) error {
+	p.prefLock.Lock()
 	p.ignoreChange = true
+	p.prefLock.Unlock()
 	defer p.resetIgnore()
 	err := os.MkdirAll(filepath.Dir(path), 0700)
 	if err != nil { // this is not an exists error according to docs
@@ -99,7 +106,10 @@ func newPreferences(app *fyneApp) *preferences {
 	}
 
 	p.AddChangeListener(func() {
-		if p.ignoreChange { // callback after loading, no need to save
+		p.prefLock.RLock()
+		shouldIgnoreChange := p.ignoreChange
+		p.prefLock.RUnlock()
+		if shouldIgnoreChange { // callback after loading, no need to save
 			return
 		}
 

app/preferences_other.go

@@ -16,7 +16,10 @@ func (a *fyneApp) storageRoot() string {
 
 func (p *preferences) watch() {
 	watchFile(p.storagePath(), func() {
-		if p.ignoreChange {
+		p.prefLock.RLock()
+		shouldIgnoreChange := p.ignoreChange
+		p.prefLock.RUnlock()
+		if shouldIgnoreChange {
 			return
 		}