Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an error where time travelling with no chrono tasks would cause a segmentation fault #105

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Fix an error where time travelling with no chrono tasks would cause a segmentation fault #105

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8906fa3
Fix an error where time travelling with no chrono tasks would cause a…
TrentHouliston Apr 30, 2024
c189424
clang-tidy
TrentHouliston Apr 30, 2024
2dd19c5
Merge branch 'main' into houliston/traveltasks
TrentHouliston Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/extension/ChronoController.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,10 @@ namespace extension {

} break;
case message::TimeTravel::Action::NEAREST: {
auto next_task =
std::min_element(tasks.begin(), tasks.end(), [](const ChronoTask& a, const ChronoTask& b) {
return a.time < b.time;
});
clock::set_clock(std::min(next_task->time, travel.target), travel.rtf);
const clock::time_point nearest =
tasks.empty() ? travel.target
: std::min(travel.target, std::min_element(tasks.begin(), tasks.end())->time);
clock::set_clock(nearest, travel.rtf);
} break;
}

Expand Down
Loading