Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-10 18:55:00 +01:00
commit 50e054fee7

View file

@ -684,7 +684,7 @@ public class WaypointHelper {
if (((TargetPoint) point).start) { if (((TargetPoint) point).start) {
ApplicationMode appMode = app.getSettings().getApplicationMode(); ApplicationMode appMode = app.getSettings().getApplicationMode();
//return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay()); //return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay());
if (app.getTargetPointsHelper().getTargets().getPointToStart() == null) { if (app.getTargetPointsHelper().getPointToStart() == null) {
return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay()); return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay());
} else { } else {
return iconsCache.getContentIcon(R.drawable.ic_action_marker_dark, !nightMode); return iconsCache.getContentIcon(R.drawable.ic_action_marker_dark, !nightMode);