Merge branch 'feature/networked-message-channel' into feature/in-game-feed

LPLafontaineB · LPLafontaineB · commit 35967309dd9c · 2022-04-21T16:12:25.000-04:00
diff --git a/Assets/BossRoom/Scripts/Shared/Infrastructure/PubSub/NetworkedMessageChannel.cs b/Assets/BossRoom/Scripts/Shared/Infrastructure/PubSub/NetworkedMessageChannel.cs
@@ -27,7 +27,7 @@ public override void Dispose()
         {
             if (!IsDisposed)
             {
-                if (NetworkManager.Singleton != null && NetworkManager.Singleton.CustomMessagingManager != null)
+                if (NetworkManager.Singleton != null && NetworkManager.Singleton.CustomMessagingManager != null && m_HasRegisteredHandler)
                 {
                     NetworkManager.Singleton.CustomMessagingManager.UnregisterNamedMessageHandler(m_Name);
                 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override void Dispose()`
`27`	`27`	`{`
`28`	`28`	`if (!IsDisposed)`
`29`	`29`	`{`
`30`		`- if (NetworkManager.Singleton != null && NetworkManager.Singleton.CustomMessagingManager != null)`
	`30`	`+ if (NetworkManager.Singleton != null && NetworkManager.Singleton.CustomMessagingManager != null && m_HasRegisteredHandler)`
`31`	`31`	`{`
`32`	`32`	`NetworkManager.Singleton.CustomMessagingManager.UnregisterNamedMessageHandler(m_Name);`
`33`	`33`	`}`