From e5822cdf8e82ebc58b8718e449cf2a79aa3cafa2 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 8 Jan 2020 17:43:43 +0200
Subject: [PATCH] Fix possibility to select marker when favorites hidden

---
 OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
index 8903f1fd29..d8ce1883a1 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
@@ -546,7 +546,8 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
 						if (!unknownLocation && selectMarkerOnSingleTap) {
 							o.add(marker);
 						} else {
-							if (isMarkerOnFavorite(marker) || isMarkerOnWaypoint(marker)) {
+							if (isMarkerOnFavorite(marker) && app.getSettings().SHOW_FAVORITES.get()
+									|| isMarkerOnWaypoint(marker) && app.getSettings().SHOW_WPT.get()) {
 								continue;
 							}
 							Amenity mapObj = getMapObjectByMarker(marker);