fix(messenger)_: stop broadcasting status once messenger is shutdown

status-im · Feb 10, 2025 · 9b25f93 · 9b25f93
1 parent 989b412
commit 9b25f93
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/protocol/messenger_status_updates.go b/protocol/messenger_status_updates.go
@@ -196,13 +196,15 @@ func (m *Messenger) broadcastLatestUserStatus() {
 	ctx := context.Background()
 	go func() {
 		defer gocommon.LogOnPanic()
+
+		select {
 		// Ensure that we are connected before sending a message
-		time.Sleep(5 * time.Second)
-		m.sendCurrentUserStatus(ctx)
-	}()
+		case <-time.After(5 * time.Second):
+			m.sendCurrentUserStatus(ctx)
+		case <-m.quit:
+			return
+		}
 
-	go func() {
-		defer gocommon.LogOnPanic()
 		for {
 			select {
 			case <-time.After(5 * time.Minute):