Fix possible race in schedulePlayerSettingChange

yktoo · Aug 13, 2020 · 8a5863f · 8a5863f
1 parent 18cdc31
commit 8a5863f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/internal/player/prefs.go b/internal/player/prefs.go
@@ -22,6 +22,7 @@ import (
 	"github.com/yktoo/ymuse/internal/config"
 	"github.com/yktoo/ymuse/internal/generated"
 	"github.com/yktoo/ymuse/internal/util"
+	"sync"
 	"time"
 )
 
@@ -65,6 +66,7 @@ type PrefsDialog struct {
 	queueColumns []queueCol
 	// Timer for delayed player setting change callback invocation
 	playerSettingChangeTimer *time.Timer
+	playerSettingChangeMutex sync.Mutex
 	// Callbacks
 	onQueueColumnsChanged  func()
 	onPlayerSettingChanged func()
@@ -337,15 +339,18 @@ func (d *PrefsDialog) populateColumns() {
 
 func (d *PrefsDialog) schedulePlayerSettingChange() {
 	// Cancel the currently scheduled callback, if any
+	d.playerSettingChangeMutex.Lock()
+	defer d.playerSettingChangeMutex.Unlock()
 	if d.playerSettingChangeTimer != nil {
 		d.playerSettingChangeTimer.Stop()
 	}
+
 	// Schedule a new callback
 	d.playerSettingChangeTimer = time.AfterFunc(time.Second, func() {
-		util.WhenIdle("onPlayerSettingChanged()", func() {
-			d.playerSettingChangeTimer = nil
-			d.onPlayerSettingChanged()
-		})
+		d.playerSettingChangeMutex.Lock()
+		d.playerSettingChangeTimer = nil
+		d.playerSettingChangeMutex.Unlock()
+		util.WhenIdle("onPlayerSettingChanged()", d.onPlayerSettingChanged)
 	})
 }