From 15556ad389067c5fc1ab3290c29ae1af704ee538 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Fri, 5 Feb 2021 15:38:54 +1100
Subject: [PATCH] Fix issue with expired listeners

---
 lib/event/manager.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/event/manager.go b/lib/event/manager.go
index 45199886..8e855bb4 100644
--- a/lib/event/manager.go
+++ b/lib/event/manager.go
@@ -18,6 +18,7 @@ type Manager struct {
 	log            *logger.CustomLogger
 	renderer       interfaces.Renderer // Messages will be dispatched to the frontend
 	wg             sync.WaitGroup
+	mu             sync.Mutex
 }
 
 // NewManager creates a new event manager with a 100 event buffer
@@ -136,6 +137,8 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 					e.log.Error(err.Error())
 				}
 
+				e.mu.Lock()
+
 				// Notify Go listeners
 				var listenersToRemove int
 
@@ -162,13 +165,17 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 
 				// Remove expired listeners in place
 				if listenersToRemove > 0 {
-					listeners := e.listeners[event.Name][:0]
-					for _, listener := range listeners {
-						if !listener.expired {
-							listeners = append(listeners, listener)
+					listeners := e.listeners[event.Name]
+					for index, listener := range listeners {
+						if listener.expired {
+							listeners[index] = listeners[len(listeners)-1]
+							listeners[len(listeners)-1] = nil
+							e.listeners[event.Name] = listeners[:len(listeners)-1]
 						}
 					}
 				}
+				e.mu.Unlock()
+
 			case <-e.quitChannel:
 				e.running = false
 			}