emit callhistory availability event in the UI thread

ftl · Sep 14, 2024 · 8b09ef0 · 8b09ef0
1 parent 0225b9c
commit 8b09ef0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/core/app/app.go b/core/app/app.go
@@ -137,7 +137,7 @@ func (c *Controller) Startup() {
 
 	c.ServiceStatus = newServiceStatus(c.asyncRunner)
 
-	c.callHistoryFinder = callhistory.New(c.ServiceStatus.StatusChanged)
+	c.callHistoryFinder = callhistory.New(c.ServiceStatus.StatusChanged, c.asyncRunner)
 	c.Settings = settings.New(
 		c.OpenConfigurationFile,
 		c.openWithExternalApplication,

diff --git a/core/callhistory/callhistory.go b/core/callhistory/callhistory.go
@@ -22,18 +22,21 @@ const (
 	Exch1Field = "Exch1"
 )
 
-func New(availabilityCallback AvailabilityCallback) *Finder {
+func New(availabilityCallback AvailabilityCallback, asyncRunner core.AsyncRunner) *Finder {
 	return &Finder{
 		dataLock:             new(sync.Mutex),
 		availabilityCallback: availabilityCallback,
+		asyncRunner:          asyncRunner,
 	}
 }
 
 type Finder struct {
-	database             *scp.Database
-	cache                map[string][]scp.Match
-	dataLock             *sync.Mutex
+	database *scp.Database
+	cache    map[string][]scp.Match
+	dataLock *sync.Mutex
+
 	availabilityCallback AvailabilityCallback
+	asyncRunner          core.AsyncRunner
 
 	listeners []any
 
@@ -114,7 +117,9 @@ func (f *Finder) findInDatabase(s string) ([]scp.Match, error) {
 func (f *Finder) emitAvailableCallHistoryFieldNames(fieldNames []string) {
 	for _, listener := range f.listeners {
 		if fieldNamesListener, ok := listener.(AvailableFieldNamesListener); ok {
-			fieldNamesListener.SetAvailableCallHistoryFieldNames(fieldNames)
+			f.asyncRunner(func() {
+				fieldNamesListener.SetAvailableCallHistoryFieldNames(fieldNames)
+			})
 		}
 	}
 }