fix: issue of registered listener is not being remove on RemoveListener.

pubnub · Sep 30, 2024 · 28b8125 · 28b8125
1 parent f352181
commit 28b8125
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/Api/PubnubApi/Pubnub.cs b/src/Api/PubnubApi/Pubnub.cs
@@ -412,15 +412,18 @@ public bool AddListener(SubscribeCallback listener)
             }
         }
 
-        public bool RemoveListener(SubscribeCallback listener)
-        {
-            bool ret = false;
-            if (subscribeCallbackListenerList != null)
-            {
-                ret = subscribeCallbackListenerList.Remove(listener);
-            }
-            return ret;
-        }
+		public bool RemoveListener(SubscribeCallback listener)
+		{
+			bool ret = false;
+			if (subscribeCallbackListenerList != null) {
+				ret = subscribeCallbackListenerList.Remove(listener);
+			}
+			if (listenerManager != null) {
+				var removeFromListenerManager = listenerManager.RemoveListener(listener);
+				if (!ret) ret = ret || removeFromListenerManager;
+			}
+			return ret;
+		}
         #endregion
 
         public EndPoint.SendFileOperation SendFile()