TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for multifile flush

Browse Source
This commit is contained in:
David Rose 2008-11-14 01:33:40 +00:00
parent d653bfc559
commit 55098c79a5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/express/multifile.cxx
View File

@ -641,10 +641,17 @@ flush() {
// All right, now write out each subfile's data.
for (pi = _new_subfiles.begin(); pi != _new_subfiles.end(); ++pi) {
Subfile *subfile = (*pi);
_read->acquire();
_next_index = subfile->write_data(*_write, _read->get_istream(),
_next_index, this);
_read->release();
if (_read != (IStreamWrapper *)NULL) {
_read->acquire();
_next_index = subfile->write_data(*_write, _read->get_istream(),
_next_index, this);
_read->release();
} else {
_next_index = subfile->write_data(*_write, NULL, _next_index, this);
}
nassertr(_next_index == _write->tellp(), false);
_next_index = pad_to_streampos(_next_index);
if (subfile->is_data_invalid()) {