From be06fd3a6bbd0eda466eb18af0fd9dd43444dece Mon Sep 17 00:00:00 2001
From: Chumva <faiver.unknown@gmail.com>
Date: Wed, 20 Mar 2019 16:57:39 +0200
Subject: [PATCH] Add check for routeCalculationInProgress before opening menu
 to half screen

---
 .../plus/routepreparationmenu/MapRouteInfoMenu.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
index 691578a8d5..0326dbf9de 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
@@ -406,12 +406,12 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 		if (app != null && fragmentRef != null && fragment.isVisible()) {
 			boolean routeCalculating = app.getRoutingHelper().isRouteBeingCalculated() || app.getTransportRoutingHelper().isRouteBeingCalculated();
 			if (setRouteCalculationInProgress(routeCalculating)) {
-				if (!routeCalculationInProgress) {
-					fragment.hideRouteCalculationProgressBar();
-				}
 				fragment.updateControlButtons();
 				fragment.updateInfo();
-				fragment.openMenuHalfScreen();
+				if (!routeCalculationInProgress) {
+					fragment.hideRouteCalculationProgressBar();
+					fragment.openMenuHalfScreen();
+				}
 			}
 		}
 	}
@@ -705,6 +705,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 			routingHelper.setAppMode(next);
 			app.initVoiceCommandPlayer(mapActivity, next, true, null, false, false);
 			routingHelper.recalculateRouteDueToSettingsChange();
+			updateMenu();
 		}
 	}