From 962d6d7e4877b5d1fd8717bb08d79f1d6689a934 Mon Sep 17 00:00:00 2001 From: fonsinchen Date: Sun, 10 Nov 2013 15:18:49 +0000 Subject: (svn r25963) -Fix [FS#5758]: Mixtures of old and new flows could create cycles. --- src/linkgraph/linkgraphjob.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/linkgraph') diff --git a/src/linkgraph/linkgraphjob.cpp b/src/linkgraph/linkgraphjob.cpp index b6c1747a2..717a7305d 100644 --- a/src/linkgraph/linkgraphjob.cpp +++ b/src/linkgraph/linkgraphjob.cpp @@ -72,7 +72,11 @@ LinkGraphJob::~LinkGraphJob() st2->goods[this->Cargo()].node != it->first || (*lg)[node_id][it->first].LastUpdate() == INVALID_DATE) { /* Edge has been removed. Delete flows. */ - flows.DeleteFlows(to); + StationIDStack erased = flows.DeleteFlows(to); + /* Delete old flows for source stations which have been deleted + * from the new flows. This avoids flow cycles between old and + * new flows. */ + while (!erased.IsEmpty()) ge.flows.erase(erased.Pop()); } else if ((*lg)[node_id][it->first].LastUnrestrictedUpdate() == INVALID_DATE) { /* Edge is fully restricted. */ flows.RestrictFlows(to); -- cgit v1.2.3-54-g00ecf