Fix null pointer in case if selectedMarketPrice is null

This commit is contained in:
chimp1984 2020-08-29 12:19:36 -05:00
parent 38f9d251ae
commit 8253957cb2
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3

View file

@ -383,15 +383,15 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
contentContainer.getChildren().setAll(view.getRoot());
try {
navButtons.getToggles().stream()
.filter(toggle -> toggle instanceof NavButton)
.filter(button -> viewClass == ((NavButton) button).viewClass)
.findFirst()
.orElseThrow(() -> new BisqException("No button matching %s found", viewClass))
.setSelected(true);
navButtons.getToggles().stream()
.filter(toggle -> toggle instanceof NavButton)
.filter(button -> viewClass == ((NavButton) button).viewClass)
.findFirst()
.orElseThrow(() -> new BisqException("No button matching %s found", viewClass))
.setSelected(true);
} catch (BisqException e) {
navigation.navigateTo(MainView.class, MarketView.class, OfferBookChartView.class);
}
}
});
VBox splashScreen = createSplashScreen();
@ -538,7 +538,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel>
return Res.get("mainView.marketPrice.tooltip",
"Bisq Price Index for " + selectedCurrencyCode,
"",
DisplayUtils.formatTime(new Date(selectedMarketPrice.getTimestampSec())),
selectedMarketPrice != null ? DisplayUtils.formatTime(new Date(selectedMarketPrice.getTimestampSec())) : Res.get("shared.na"),
model.getPriceFeedService().getProviderNodeAddress());
}