Merge pull request #4223 from mbaklor/fix-callback-lock

fixed entry OnChanged callback in propery lock
fyne-io · Sep 10, 2023 · d616000 · d616000
2 parents 0f0c642 + e47c92b
commit d616000
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/widget/entry.go b/widget/entry.go
@@ -489,12 +489,13 @@ func (e *Entry) Append(text string) {
 	provider.insertAt(provider.len(), text)
 	content := provider.String()
 	changed := e.updateText(content)
+	cb := e.OnChanged
 	e.propertyLock.Unlock()
 
 	if changed {
 		e.Validate()
-		if e.OnChanged != nil {
-			e.OnChanged(content)
+		if cb != nil {
+			cb(content)
 		}
 	}
 	e.Refresh()
@@ -668,11 +669,12 @@ func (e *Entry) TypedKey(key *fyne.KeyEvent) {
 	if e.CursorRow == e.selectRow && e.CursorColumn == e.selectColumn {
 		e.selecting = false
 	}
+	cb := e.OnChanged
 	e.propertyLock.Unlock()
 	if changed {
 		e.Validate()
-		if e.OnChanged != nil {
-			e.OnChanged(content)
+		if cb != nil {
+			cb(content)
 		}
 	}
 	e.Refresh()
@@ -845,11 +847,12 @@ func (e *Entry) cutToClipboard(clipboard fyne.Clipboard) {
 
 	e.copyToClipboard(clipboard)
 	e.setFieldsAndRefresh(e.eraseSelection)
-	e.propertyLock.Lock()
-	if e.OnChanged != nil {
-		e.OnChanged(e.Text)
+	e.propertyLock.RLock()
+	cb := e.OnChanged
+	e.propertyLock.RUnlock()
+	if cb != nil {
+		cb(e.Text)
 	}
-	e.propertyLock.Unlock()
 	e.Validate()
 }
 
@@ -1090,11 +1093,12 @@ func (e *Entry) selectingKeyHandler(key *fyne.KeyEvent) bool {
 	case fyne.KeyBackspace, fyne.KeyDelete:
 		// clears the selection -- return handled
 		e.setFieldsAndRefresh(e.eraseSelection)
-		e.propertyLock.Lock()
-		if e.OnChanged != nil {
-			e.OnChanged(e.Text)
+		e.propertyLock.RLock()
+		cb := e.OnChanged
+		e.propertyLock.RUnlock()
+		if cb != nil {
+			cb(e.Text)
 		}
-		e.propertyLock.Unlock()
 		e.Validate()
 		return true
 	case fyne.KeyReturn, fyne.KeyEnter: