From 5f07cd963850cdcd3956d1631d5821d566182ffe Mon Sep 17 00:00:00 2001 From: PavelRatushny Date: Fri, 28 Jul 2017 12:24:07 +0300 Subject: [PATCH] Add variables --- .../osmand/plus/myplaces/TrackSegmentFragment.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java index a3e44da23e..9567a91566 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java @@ -278,18 +278,20 @@ public class TrackSegmentFragment extends OsmAndListFragment { imageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - WptPt pointToShow = getGpx() != null ? getGpx().findPointToShow() : null; + GpxDataItem gpxDataItem = getGpxDataItem(); + GPXFile gpx = getGpx(); + WptPt pointToShow = gpx != null ? gpx.findPointToShow() : null; if (pointToShow != null) { LatLon location = new LatLon(pointToShow.getLatitude(), pointToShow.getLongitude()); final OsmandSettings settings = app.getSettings(); String trackName = ""; - if (getGpx().showCurrentTrack) { + if (gpx.showCurrentTrack) { trackName = getString(R.string.shared_string_currently_recording_track); - } else if (getGpxDataItem() != null) { - trackName = getGpxDataItem().getFile().getName(); - } else if (getGpx() != null) { - trackName = getGpx().path; + } else if (gpxDataItem != null) { + trackName = gpxDataItem.getFile().getName(); + } else { + trackName = gpx.path; } settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(), settings.getLastKnownMapZoom(),