client/core: avoid potential wallet reconfigure deadlock

decred · Jan 14, 2021 · 4bed3e2 · 4bed3e2
1 parent bca1325
commit 4bed3e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ node_modules/
 client/cmd/dexc/dexc
 client/cmd/dexcctl/dexcctl
 wiki
+bin/
diff --git a/client/core/core.go b/client/core/core.go
@@ -1430,7 +1430,7 @@ func (c *Core) loadWallet(dbWallet *db.Wallet) (*xcWallet, error) {
 	walletCfg := &asset.WalletConfig{
 		Settings: dbWallet.Settings,
 		TipChange: func(err error) {
-			c.tipChange(assetID, err)
+			go c.tipChange(assetID, err)
 		},
 	}
 	logger := c.log.SubLogger(unbip(assetID))
@@ -1625,11 +1625,10 @@ func (c *Core) ReconfigureWallet(appPW []byte, assetID uint32, cfg map[string]st
 	}
 	c.connMtx.RUnlock()
 
-	if oldWallet.connected() {
-		oldWallet.Disconnect()
-	}
 	c.wallets[assetID] = wallet
 
+	go oldWallet.Disconnect()
+
 	c.notify(newBalanceNote(assetID, balances)) // redundant with wallet config note?
 	details := fmt.Sprintf("Configuration for %s wallet has been updated. Deposit address = %s", unbip(assetID), wallet.address)
 	c.notify(newWalletConfigNote("Wallet Configuration Updated", details, db.Success, wallet.state()))
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,4 @@ node_modules/ @@
     client/cmd/dexc/dexc
     client/cmd/dexcctl/dexcctl
     wiki
+    bin/