ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when deleting AVIWriter with file closing

Browse Source
This commit is contained in:
Benau 2017-03-22 11:34:42 +08:00
parent 7e9f723038
commit 9a69859c8f
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/utils/avi_writer.cpp
View File

@ -110,7 +110,7 @@ void* AVIWriter::startRoutine(void *obj)
} }
else if (fbi == NULL) else if (fbi == NULL)
{ {
avi_writer->closeFile(); avi_writer->closeFile(false/*delete_file*/, true/*exiting*/);
avi_writer->setCanBeDeleted(); avi_writer->setCanBeDeleted();
avi_writer->m_fbi_queue.getData().pop_front(); avi_writer->m_fbi_queue.getData().pop_front();
avi_writer->m_fbi_queue.unlock(); avi_writer->m_fbi_queue.unlock();
@ -276,7 +276,7 @@ bool AVIWriter::addJUNKChunk(std::string str, unsigned int min_size)
return true; return true;
error: error:
closeFile(true); closeFile(true/*delete_file*/);
return false; return false;
} // addJUNKChunk } // addJUNKChunk
@ -335,7 +335,7 @@ AVIErrCode AVIWriter::addImage(unsigned char* buffer, int buf_size)
return AVI_SUCCESS; return AVI_SUCCESS;
error: error:
closeFile(true); closeFile(true/*delete_file*/);
return AVI_IO_ERR; return AVI_IO_ERR;
size_limit: size_limit:
@ -346,7 +346,7 @@ size_limit:
} // addImage } // addImage
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool AVIWriter::closeFile(bool delete_file) bool AVIWriter::closeFile(bool delete_file, bool exiting)
{ {
if (m_file == NULL) if (m_file == NULL)
return false; return false;
@ -426,12 +426,19 @@ bool AVIWriter::closeFile(bool delete_file)
fclose(m_file); fclose(m_file);
m_file = NULL; m_file = NULL;
MessageQueue::add(MessageQueue::MT_GENERIC, if (!exiting)
_("Video saved in \"%s\".", m_filename.c_str())); {
MessageQueue::add(MessageQueue::MT_GENERIC,
_("Video saved in \"%s\".", m_filename.c_str()));
}
return true; return true;
error: error:
MessageQueue::add(MessageQueue::MT_ERROR, _("Error when saving video.")); if (!exiting)
{
MessageQueue::add(MessageQueue::MT_ERROR,
_("Error when saving video."));
}
fclose(m_file); fclose(m_file);
remove(m_filename.c_str()); remove(m_filename.c_str());
m_file = NULL; m_file = NULL;
@ -575,7 +582,7 @@ bool AVIWriter::createFile()
return true; return true;
error: error:
closeFile(true); closeFile(true/*delete_file*/);
return false; return false;
} // createFile } // createFile

2
src/utils/avi_writer.hpp
View File

@ -206,7 +206,7 @@ private:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
AVIErrCode addImage(unsigned char* buffer, int size); AVIErrCode addImage(unsigned char* buffer, int size);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool closeFile(bool delete_file = false); bool closeFile(bool delete_file = false, bool exiting = false);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool createFile(); bool createFile();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------