From 24a4386f89366e28ff5196be4bdf91dccb7dc088 Mon Sep 17 00:00:00 2001
From: Android-X13 <76814540+Android-X13@users.noreply.github.com>
Date: Fri, 18 Nov 2022 17:18:06 +0200
Subject: [PATCH] Fix NPE in NetworkSettingsView when there are no connected
 peers

---
 .../desktop/main/settings/network/NetworkSettingsView.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java
index 2401851342b..2004f6cb143 100644
--- a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java
@@ -502,9 +502,10 @@ private void updateBitcoinPeersTable() {
         bitcoinNetworkListItems.setAll(walletsSetup.getPeerGroup().getConnectedPeers().stream()
                 .map(BitcoinNetworkListItem::new)
                 .collect(Collectors.toList()));
+        int bitcoinPeersChainHeight = walletsSetup.connectedPeersProperty().get() != null ?
+                PeerGroup.getMostCommonChainHeight(walletsSetup.connectedPeersProperty().get()) : 0;
         chainHeightTextField.textProperty().setValue(Res.get("settings.net.chainHeight",
-                walletsSetup.chainHeightProperty().get(),
-                PeerGroup.getMostCommonChainHeight(walletsSetup.connectedPeersProperty().get())));
+                walletsSetup.chainHeightProperty().get(), bitcoinPeersChainHeight));
     }
 }