From 2d6e817d1dc1aab2762d1db2c899eb2eb00f8841 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 7 Jun 2016 22:04:34 +0200 Subject: [PATCH] Fix reading multifiles that were built with -F option --- panda/src/express/multifile.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/panda/src/express/multifile.cxx b/panda/src/express/multifile.cxx index 63177a3dfe..c99c83bdb3 100644 --- a/panda/src/express/multifile.cxx +++ b/panda/src/express/multifile.cxx @@ -2336,12 +2336,12 @@ read_index() { } _last_data_byte = max(_last_data_byte, subfile->get_last_byte_pos()); } - streampos curr_pos = normalize_streampos(read->tellg() - _offset); - bytes_skipped = index_forward - curr_pos; - if (bytes_skipped > 0) { - read->ignore(bytes_skipped); - } + streampos curr_pos = read->tellg() - _offset; + bytes_skipped = index_forward - normalize_streampos(curr_pos); _next_index = index_forward; + if (_next_index > curr_pos) { + read->ignore(_next_index - curr_pos); + } subfile = new Subfile; index_forward = subfile->read_index(*read, _next_index, this); }