Merge pull request #154 from WalletConnect/fix/relayer-reconnects-on-…

…disposal fix: relayer reconnects on disposal
WalletConnect · Nov 9, 2023 · 5a5f25e · 5a5f25e
2 parents bf7afdc + 6f203ab
commit 5a5f25e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/WalletConnectSharp.Core/Controllers/Relayer.cs b/WalletConnectSharp.Core/Controllers/Relayer.cs
@@ -230,13 +230,15 @@ protected virtual void RegisterProviderEventListeners()
 
         protected virtual void RegisterEventListeners()
         {
-            this.OnConnectionStalled += async (sender, args) =>
-            {
-                if (this.Provider.Connection.IsPaused)
-                    return;
+            this.OnConnectionStalled += OnConnectionStalledHandler;
+        }
 
-                await this.RestartTransport();
-            };
+        private async void OnConnectionStalledHandler(object sender, EventArgs e)
+        {
+            if (this.Provider.Connection.IsPaused)
+                return;
+
+            await this.RestartTransport();
         }
 
         protected virtual async void OnProviderPayload(string payloadJson)
@@ -499,6 +501,9 @@ protected virtual void Dispose(bool disposing)
 
             if (disposing)
             {
+                _transportExplicitlyClosed = true;
+                this.OnConnectionStalled -= OnConnectionStalledHandler;
+
                 Subscriber?.Dispose();
                 Publisher?.Dispose();
                 Messages?.Dispose();