Merge branch 'master' into hashremoval

2022-06-01 10:06:33 -07:00
parent 1e098496be 8939a3aa66
commit 998b9ba482
16 changed files with 123 additions and 77 deletions
@@ -350,7 +350,9 @@ NodeValueTable NodeTraverser::GenerateBlockTable(const Track *track, const TimeR
  NodeValueTable table;

  if (active_block) {
+    block_stack_.push_back(active_block);
    table = GenerateTable(active_block, Track::TransformRangeForBlock(active_block, range), track);
+    block_stack_.pop_back();
  }

  return table;