Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-06 20:07:00 +01:00
commit 7cbb16148d

View file

@ -80,7 +80,7 @@ public class CurrentPositionHelper {
} }
}; };
calculatingThread = app.getRoutingHelper().startTaskInRouteThreadIfPossible(run); calculatingThread = app.getRoutingHelper().startTaskInRouteThreadIfPossible(run);
} else if (!calcThread.isAlive()) { } else if (calcThread != null && !calcThread.isAlive()) {
calculatingThread = null; calculatingThread = null;
} }
} }