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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-12-09 22:26:06 +01:00
commit 163cf694a3
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
View file

@ -59,10 +59,11 @@ public class CurrentPositionHelper {
} }
private void scheduleRouteSegmentFind(final Location loc){ private void scheduleRouteSegmentFind(final Location loc) {
if(calculatingThread == Thread.currentThread()) { if (calculatingThread == Thread.currentThread()) {
lastFound = runUpdateInThreadCatch(loc.getLatitude(), loc.getLongitude()); lastFound = runUpdateInThreadCatch(loc.getLatitude(), loc.getLongitude());
} else if(calculatingThread == null && loc != null) { } else if (loc != null) {
if (calculatingThread == null) {
Runnable run = new Runnable() { Runnable run = new Runnable() {
@Override @Override
public void run() { public void run() {
@ -78,6 +79,9 @@ public class CurrentPositionHelper {
} }
}; };
calculatingThread = app.getRoutingHelper().startTaskInRouteThreadIfPossible(run); calculatingThread = app.getRoutingHelper().startTaskInRouteThreadIfPossible(run);
} else if (!calculatingThread.isAlive()) {
calculatingThread = null;
}
} }
} }

3
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -823,9 +823,10 @@ public class RoutingHelper {
}, "Calculating position"); //$NON-NLS-1$ }, "Calculating position"); //$NON-NLS-1$
currentRunningJob.start(); currentRunningJob.start();
} }
}
return currentRunningJob; return currentRunningJob;
} }
return null;
}
private void updateProgress(final RouteCalculationProgress calculationProgress) { private void updateProgress(final RouteCalculationProgress calculationProgress) {