Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-03-27 10:47:43 +02:00
commit 1da75cd404

View file

@ -42,6 +42,7 @@ import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
import net.osmand.plus.mapcontextmenu.editors.PointEditor;
import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
import net.osmand.plus.mapcontextmenu.other.ShareMenu;
import net.osmand.plus.monitoring.OsmandMonitoringPlugin;
import net.osmand.plus.routing.RoutingHelper;
@ -352,7 +353,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
@Nullable PointDescription pointDescription,
@Nullable Object object) {
if (init(latLon, pointDescription, object)) {
showInternal();
if (!MapRouteInfoMenu.isVisible()) {
showInternal();
}
}
}