skip invalid segment

deanlee · deanlee · commit d607b54eb382 · 2021-09-29T15:33:12.000+08:00
diff --git a/selfdrive/ui/replay/replay.cc b/selfdrive/ui/replay/replay.cc
@@ -108,11 +108,15 @@ void Replay::queueSegment() {
     }
     end_idx = i;
     // skip invalid segment
-    fwd += segments_[i]->isValid();
+    if (segments_[i]->isValid()) {
+      ++fwd;
+    } else if (i == cur_seg) {
+      ++cur_seg;
+    }
   }
 
   // merge segments
-  mergeSegments(cur_seg, end_idx);
+  mergeSegments(std::max(cur_seg, segments_.size() - 1), end_idx);
 }
 
 void Replay::mergeSegments(int cur_seg, int end_idx) {

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,15 @@ void Replay::queueSegment() {`
`108`	`108`	`}`
`109`	`109`	`end_idx = i;`
`110`	`110`	`// skip invalid segment`
`111`		`- fwd += segments_[i]->isValid();`
	`111`	`+ if (segments_[i]->isValid()) {`
	`112`	`+ ++fwd;`
	`113`	`+ } else if (i == cur_seg) {`
	`114`	`+ ++cur_seg;`
	`115`	`+ }`
`112`	`116`	`}`
`113`	`117`
`114`	`118`	`// merge segments`
`115`		`- mergeSegments(cur_seg, end_idx);`
	`119`	`+ mergeSegments(std::max(cur_seg, segments_.size() - 1), end_idx);`
`116`	`120`	`}`
`117`	`121`
`118`	`122`	`void Replay::mergeSegments(int cur_seg, int end_idx) {`