Fix Thirdweb Wallet Disconnect Null Reference (#106)

jeffgamedev · jeffgamedev · web-flow · commit 305983622df8 · 2023-08-17T19:51:45.000+03:00
Co-authored-by: jeffgamedev &lt;jbrooks@gala.games&gt;
diff --git a/Assets/Thirdweb/Core/Scripts/ThirdwebSession.cs b/Assets/Thirdweb/Core/Scripts/ThirdwebSession.cs
@@ -112,7 +112,14 @@ internal async Task<string> Connect(WalletConnection walletConnection)
 
         internal async Task Disconnect()
         {
-            await ActiveWallet.Disconnect();
+            if (ActiveWallet != null)
+            {
+                await ActiveWallet.Disconnect();
+            }
+            else
+            {
+                Debug.LogWarning("No active wallet detected, unable to disconnect.");
+            }
             ThirdwebManager.Instance.SDK.session = new ThirdwebSession(Options, ChainId, RPC);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,14 @@ internal async Task<string> Connect(WalletConnection walletConnection)`
`112`	`112`
`113`	`113`	`internal async Task Disconnect()`
`114`	`114`	`{`
`115`		`- await ActiveWallet.Disconnect();`
	`115`	`+ if (ActiveWallet != null)`
	`116`	`+ {`
	`117`	`+ await ActiveWallet.Disconnect();`
	`118`	`+ }`
	`119`	`+ else`
	`120`	`+ {`
	`121`	`+ Debug.LogWarning("No active wallet detected, unable to disconnect.");`
	`122`	`+ }`
`116`	`123`	`ThirdwebManager.Instance.SDK.session = new ThirdwebSession(Options, ChainId, RPC);`
`117`	`124`	`}`
`118`	`125`