From d5c6393f2350a941d4a7041d902473f79209fd81 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 22 Sep 2025 16:11:21 +0300
Subject: [PATCH] bridgev2/portal: don't process any more events if portal is
 deleted

---
 bridgev2/portal.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bridgev2/portal.go b/bridgev2/portal.go
index f53691fa..4637d6ba 100644
--- a/bridgev2/portal.go
+++ b/bridgev2/portal.go
@@ -90,7 +90,8 @@ type Portal struct {
 	functionalMembersLock  sync.Mutex
 	functionalMembersCache *event.ElementFunctionalMembersContent
 
-	events chan portalEvent
+	events  chan portalEvent
+	deleted bool
 
 	eventsLock sync.Mutex
 	eventIdx   int
@@ -335,6 +336,9 @@ func (portal *Portal) eventLoop() {
 	}
 	i := 0
 	for rawEvt := range portal.events {
+		if portal.deleted {
+			return
+		}
 		i++
 		if portal.Bridge.Config.AsyncEvents {
 			go portal.handleSingleEventWithDelayLogging(i, rawEvt)
@@ -4811,6 +4815,7 @@ func (portal *Portal) unlockedDeleteCache() {
 		// TODO there's a small risk of this racing with a queueEvent call
 		close(portal.events)
 	}
+	portal.deleted = true
 }
 
 func (portal *Portal) Save(ctx context.Context) error {