mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-28 02:09:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix #127, threads should not be cancelled after being joined

Browse Source
This commit is contained in:
jacksonmj
2013-07-06 21:26:52 +01:00
parent 74b8b2c85b
commit 1b58c1eea8
1 changed files with 15 additions and 3 deletions
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)