cabana: add empty check before insert events (#29798)

old-commit-hash: 60593660e6
test-msgs
Dean Lee 2 years ago committed by GitHub
parent e0d733ccfd
commit 64c3dc5ad6
  1. 6
      tools/cabana/streams/abstractstream.cc

@ -167,8 +167,10 @@ void AbstractStream::mergeEvents(std::vector<Event *>::const_iterator first, std
e.insert(insert_pos, new_e.cbegin(), new_e.cend()); e.insert(insert_pos, new_e.cbegin(), new_e.cend());
} }
auto insert_pos = std::upper_bound(all_events_.cbegin(), all_events_.cend(), new_events.front(), compare); if (!new_events.empty()) {
all_events_.insert(insert_pos, new_events.cbegin(), new_events.cend()); auto insert_pos = std::upper_bound(all_events_.cbegin(), all_events_.cend(), new_events.front(), compare);
all_events_.insert(insert_pos, new_events.cbegin(), new_events.cend());
}
lastest_event_ts = all_events_.empty() ? 0 : all_events_.back()->mono_time; lastest_event_ts = all_events_.empty() ? 0 : all_events_.back()->mono_time;
emit eventsMerged(); emit eventsMerged();

Loading…
Cancel
Save