forked from upstream-mirrors/OpenTracks
Bugfix: prevent NPE on endRecording (race condition).
This commit is contained in:
@@ -743,8 +743,13 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand
|
|||||||
tmpLastTrackPoint.setLatitude(lastTrackPoint.getLatitude());
|
tmpLastTrackPoint.setLatitude(lastTrackPoint.getLatitude());
|
||||||
}
|
}
|
||||||
|
|
||||||
altitudeSumManager.fill(tmpLastTrackPoint);
|
BluetoothRemoteSensorManager localRemoteSensorManager = this.remoteSensorManager;
|
||||||
remoteSensorManager.fill(tmpLastTrackPoint);
|
AltitudeSumManager localAltitudeSumManager = this.altitudeSumManager;
|
||||||
|
if (localAltitudeSumManager != null && localRemoteSensorManager != null) {
|
||||||
|
// onEndRecording the managers might already be set to null.
|
||||||
|
localAltitudeSumManager.fill(tmpLastTrackPoint);
|
||||||
|
localRemoteSensorManager.fill(tmpLastTrackPoint);
|
||||||
|
}
|
||||||
|
|
||||||
tmpTrackStatisticsUpdater.addTrackPoint(tmpLastTrackPoint, recordingDistanceInterval);
|
tmpTrackStatisticsUpdater.addTrackPoint(tmpLastTrackPoint, recordingDistanceInterval);
|
||||||
track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics());
|
track.setTrackStatistics(tmpTrackStatisticsUpdater.getTrackStatistics());
|
||||||
|
|||||||
Reference in New Issue
Block a user