Merge pull request #3513 from bisq-3510/master

Launch in Limbo with BisqException when last navigation no longer exists
bisq-network · Nov 1, 2019 · 8a44358 · 8a44358
2 parents 15fce7c + 2e78e33
commit 8a44358
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java
@@ -31,6 +31,7 @@
 import bisq.desktop.main.dao.DaoView;
 import bisq.desktop.main.funds.FundsView;
 import bisq.desktop.main.market.MarketView;
+import bisq.desktop.main.market.trades.TradesChartsView;
 import bisq.desktop.main.offer.BuyOfferView;
 import bisq.desktop.main.offer.SellOfferView;
 import bisq.desktop.main.overlays.popups.Popup;
@@ -381,12 +382,16 @@ protected Tooltip computeValue() {
             View view = viewLoader.load(viewClass);
             contentContainer.getChildren().setAll(view.getRoot());
 
-            navButtons.getToggles().stream()
+            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);
+            } catch (BisqException e) {
+            	navigation.navigateTo(MainView.class, MarketView.class, TradesChartsView.class);
+			}
         });
 
         VBox splashScreen = createSplashScreen();