Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #727 from Zahnstocher/null-fix-patch

Browse source 
Fix null
This commit is contained in:
vshcherb 2014-07-03 10:58:36 +02:00
commit 65e8b77c30
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/views/controls/MapRoutePreferencesControl.java
View file

@ -283,7 +283,7 @@ public class MapRoutePreferencesControl extends MapControls {
final LocalRoutingParameter rp = getItem(position); final LocalRoutingParameter rp = getItem(position);
tv.setText(rp.getText(mapActivity)); tv.setText(rp.getText(mapActivity));
tv.setPadding((int) (5 * scaleCoefficient), 0, 0, 0); tv.setPadding((int) (5 * scaleCoefficient), 0, 0, 0);
if (rp.routingParameter.getId().equals("short_way")){ if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")){
//if short route settings - it should be inverse of fast_route_mode //if short route settings - it should be inverse of fast_route_mode
ch.setChecked(!settings.FAST_ROUTE_MODE.get()); ch.setChecked(!settings.FAST_ROUTE_MODE.get());
} else { } else {
@ -294,7 +294,7 @@ public class MapRoutePreferencesControl extends MapControls {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
//if short way that it should set valut to fast mode opposite of current //if short way that it should set valut to fast mode opposite of current
if (rp.routingParameter.getId().equals("short_way")){ if (rp.routingParameter != null && rp.routingParameter.getId().equals("short_way")){
settings.FAST_ROUTE_MODE.set(!isChecked); settings.FAST_ROUTE_MODE.set(!isChecked);
} else { } else {
rp.setSelected(settings, isChecked); rp.setSelected(settings, isChecked);