Merge branch 'go/logout-bridge'

element-hq · Feb 22, 2024 · aa09f47 · aa09f47
2 parents 7f72542 + 0cd9c9f
commit aa09f47
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/user.go b/user.go
@@ -588,8 +588,10 @@ func (user *User) saveSignalID(ctx context.Context, id uuid.UUID, number string)
 				Stringer("signal_uuid", id).
 				Msg("Another user is already logged in with same UUID, logging out previous user")
 			existingUser.Lock()
-			existingUser.clearKeysAndDisconnect(ctx)
-			existingUser.Client = nil
+			if existingUser.Client != nil {
+				existingUser.clearKeysAndDisconnect(ctx)
+				existingUser.Client = nil
+			}
 			existingUser.handleLoggedOutNoLock(ctx)
 			existingUser.Unlock()
 			if managementRoom := existingUser.GetManagementRoomID(); managementRoom != "" {