X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=ca85ac74084dace04e65d24d48cec278b9c67350;hp=9f19ffcdfb06ae470447ebeb5f01154845ae49ea;hb=862d8bea6d31e6fe9a60747e0b9559f77e72bf44;hpb=ecd7af790bd3ab7c7e768f68968379e1feea56a9

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 9f19ffc..ca85ac7 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -443,9 +443,9 @@ void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
 void TrainRoutePlanner::TrainRoutingState::update_estimate()
 {
 	TrackIter iter = track.reverse(path);
-	float distance = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
-	distance += track->get_type().get_path_length(path)-offset;
-	remaining_estimate = distance;
+	remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
+	if(remaining_estimate>=0)
+		remaining_estimate += track->get_type().get_path_length(path)-offset;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_viable() const