boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

switch to current connection on connection changed

Browse source
This commit is contained in:
woodser 2024-07-19 08:47:33 -04:00
parent 9b26682646
commit 291622e452
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -2323,6 +2323,9 @@ public abstract class Trade implements Tradable, Model {
private void onConnectionChanged(MoneroRpcConnection connection) { private void onConnectionChanged(MoneroRpcConnection connection) {
synchronized (walletLock) { synchronized (walletLock) {
// use current connection
connection = xmrConnectionService.getConnection();
// check if ignored // check if ignored
if (isShutDownStarted) return; if (isShutDownStarted) return;
if (getWallet() == null) return; if (getWallet() == null) return;

5
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View file

@ -1660,6 +1660,11 @@ public class XmrWalletService {
private void onConnectionChanged(MoneroRpcConnection connection) { private void onConnectionChanged(MoneroRpcConnection connection) {
synchronized (WALLET_LOCK) { synchronized (WALLET_LOCK) {
// use current connection
connection = xmrConnectionService.getConnection();
// check if ignored
if (wallet == null || isShutDownStarted) return; if (wallet == null || isShutDownStarted) return;
if (HavenoUtils.connectionConfigsEqual(connection, wallet.getDaemonConnection())) return; if (HavenoUtils.connectionConfigsEqual(connection, wallet.getDaemonConnection())) return;
String oldProxyUri = wallet == null || wallet.getDaemonConnection() == null ? null : wallet.getDaemonConnection().getProxyUri(); String oldProxyUri = wallet == null || wallet.getDaemonConnection() == null ? null : wallet.getDaemonConnection().getProxyUri();