matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Saveliy Skresanov 2013-07-07 11:52:43 +07:00
commit 3c5a341dbc
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/preview/PreviewModel.cpp
View File

@ -347,9 +347,21 @@ void PreviewModel::Update()
}
PreviewModel::~PreviewModel() {
pthread_cancel(updateSaveDataThread);
pthread_cancel(updateSaveInfoThread);
pthread_cancel(updateSaveCommentsThread);
if (updateSaveDataWorking)
{
pthread_cancel(updateSaveDataThread);
pthread_join(updateSaveDataThread, NULL);
}
if (updateSaveInfoWorking)
{
pthread_cancel(updateSaveInfoThread);
pthread_join(updateSaveInfoThread, NULL);
}
if (updateSaveCommentsWorking)
{
pthread_cancel(updateSaveCommentsThread);
pthread_join(updateSaveCommentsThread, NULL);
}
if(save)
delete save;
if(saveComments)