Add null checks

bisq-network · Jan 4, 2021 · f588b22 · f588b22
1 parent 9e27504
commit f588b22
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
@@ -215,8 +215,10 @@ public OfferBookViewModel(User user,
         };
 
         // If our accounts have changed we reset our myInsufficientTradeLimitCache as it depends on account data
-        user.getPaymentAccountsAsObservable().addListener((SetChangeListener<PaymentAccount>) c ->
-                myInsufficientTradeLimitCache.clear());
+        if (user != null) {
+            user.getPaymentAccountsAsObservable().addListener((SetChangeListener<PaymentAccount>) c ->
+                    myInsufficientTradeLimitCache.clear());
+        }
     }
 
     @Override
@@ -234,7 +236,9 @@ protected void activate() {
         }
         tradeCurrencyCode.set(selectedTradeCurrency.getCode());
 
-        disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
+        if (user != null) {
+            disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
+        }
         useOffersMatchingMyAccountsFilter = !disableMatchToggle.get() && isShowOffersMatchingMyAccounts();
 
         fillAllTradeCurrencies();