Skip to content
Snippets Groups Projects
Commit c89a15d9 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fixes for unit test fails

parent 3207d40c
Branches
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
Pipeline #27487 failed
...@@ -91,10 +91,12 @@ ftl::data::Frame &Builder::get(int64_t timestamp, size_t ix) { ...@@ -91,10 +91,12 @@ ftl::data::Frame &Builder::get(int64_t timestamp, size_t ix) {
auto fs = _get(timestamp); auto fs = _get(timestamp);
if (ix >= fs->frames.size()) { if (ix >= fs->frames.size()) {
throw FTL_Error("Frame index out-of-bounds - " << ix << "(" << fs->frames.size() << ")"); //throw FTL_Error("Frame index out-of-bounds - " << ix << "(" << fs->frames.size() << ")");
//while (fs->frames.size() < size_) {
// fs->frames.push_back(std::move(pool_->allocate(ftl::data::FrameID(fs->frameset(), + fs->frames.size()), fs->timestamp()))); // FIXME: This is really dangerous
//} while (fs->frames.size() < size_) {
fs->frames.push_back(std::move(pool_->allocate(ftl::data::FrameID(fs->frameset(), + fs->frames.size()), fs->timestamp())));
}
} }
//if (fs->frames.size() < size_) fs->frames.resize(size_); //if (fs->frames.size() < size_) fs->frames.resize(size_);
......
...@@ -243,6 +243,8 @@ void Frame::merge(Frame &f) { ...@@ -243,6 +243,8 @@ void Frame::merge(Frame &f) {
d.status = ChannelStatus::VALID; d.status = ChannelStatus::VALID;
touch(x.first); touch(x.first);
} }
f.status_ = FrameStatus::RELEASED;
f.changed_.clear();
} }
void Frame::moveTo(Frame &f) { void Frame::moveTo(Frame &f) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment