From 0e798fb169b8c1555f1e5652aca66c37d254fd0c Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 10 Sep 2014 16:06:50 +0200 Subject: [PATCH] bug with showAlarms status --- OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java index 55a739ed0e..cf28578a8c 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java @@ -599,11 +599,15 @@ public class WaypointHelper { } public boolean showAlarms() { - return app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SHOW_TRAFFIC_WARNINGS.get(); + //I think here only traffic warnings other than the speed cam are needed. speed cam setting is a separate setting for explicit allow/disallow by user. + //return app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SHOW_TRAFFIC_WARNINGS.get(); + return app.getSettings().SHOW_TRAFFIC_WARNINGS.get(); } public boolean announceAlarms() { - return app.getSettings().SPEAK_SPEED_CAMERA.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get(); + //I think here only traffic warnings other than the speed cam are needed. speed cam setting is a separate setting for explicit allow/disallow by user. + //return app.getSettings().SPEAK_SPEED_CAMERA.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get(); + return app.getSettings().SPEAK_TRAFFIC_WARNINGS.get(); }