Fixed race condition while accessing state, updated code as per spec

ably · Dec 5, 2023 · 5d5660d · 5d5660d
1 parent e4ef0ce
commit 5d5660d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ably/realtime_channel.go b/ably/realtime_channel.go
@@ -797,10 +797,12 @@ func (c *RealtimeChannel) notify(msg *protocolMessage) {
 		if msg.Flags != 0 {
 			c.setModes(channelModeFromFlag(msg.Flags))
 		}
-		// RTL12
-		if c.state == ChannelStateAttached && !msg.Flags.Has(flagResumed) {
-			c.emitErrorUpdate(newErrorFromProto(msg.Error), false) // RTL12
-			c.Presence.onAttach(msg, false)
+
+		if c.State() == ChannelStateAttached {
+			if !msg.Flags.Has(flagResumed) { // RTL12
+				c.Presence.onAttach(msg, true)
+				c.emitErrorUpdate(newErrorFromProto(msg.Error), false)
+			}
 		} else {
 			c.Presence.onAttach(msg, true)
 			c.setState(ChannelStateAttached, newErrorFromProto(msg.Error), msg.Flags.Has(flagResumed))