Skip to content

Commit 38e868b

Browse files
committed
fix for multi-region entries ending at borders
* Don't create key/value in regional maps (TravelMapping#665) * Avoid userlog notifications for untraveled chopped routes
1 parent aec64e1 commit 38e868b

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

siteupdate/cplusplus/classes/TravelerList/mark_connected_route_segments.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,22 @@ else { // user log warning for DISCONNECTED_ROUTE errors
166166
r1->mtx.lock();
167167
r1->mark_label_in_use(reverse ? fields[5] : fields[2]);
168168
if (r1->is_reversed())
169+
{ if (index1)
169170
r1->store_traveled_segments(this, log, update, 0, index1);
170-
else r1->store_traveled_segments(this, log, update, index1, r1->segments.size);
171+
}
172+
else if (index1 != r1->segments.size)
173+
r1->store_traveled_segments(this, log, update, index1, r1->segments.size);
171174
r1->mtx.unlock();
172175

173176
// mark the ending chopped route from its beginning to index2
174177
r2->mtx.lock();
175178
r2->mark_label_in_use(reverse ? fields[2] : fields[5]);
176179
if (r2->is_reversed())
180+
{ if (index2 != r2->segments.size)
177181
r2->store_traveled_segments(this, log, update, index2, r2->segments.size);
178-
else r2->store_traveled_segments(this, log, update, 0, index2);
182+
}
183+
else if (index2)
184+
r2->store_traveled_segments(this, log, update, 0, index2);
179185
r2->mtx.unlock();
180186

181187
// mark any intermediate chopped routes in their entirety.

0 commit comments

Comments
 (0)