diff options
| author | Saveliy Skresanov <savask@yandex.ru> | 2013-07-07 04:52:43 (GMT) |
|---|---|---|
| committer | Saveliy Skresanov <savask@yandex.ru> | 2013-07-07 04:52:43 (GMT) |
| commit | 3c5a341dbc0107fbed19a96e997711a588b80478 (patch) | |
| tree | cf4cc2eb2b00d41ec866622e28c2bda2bcb35c8b /src/gui/preview/PreviewModel.cpp | |
| parent | ac66ce3b3c08d6820fc872e5570d0c32320e3e60 (diff) | |
| parent | 1b58c1eea8be8619e428f9995a4cb8ef1ec04941 (diff) | |
| download | powder-3c5a341dbc0107fbed19a96e997711a588b80478.zip powder-3c5a341dbc0107fbed19a96e997711a588b80478.tar.gz | |
Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/gui/preview/PreviewModel.cpp')
| -rw-r--r-- | src/gui/preview/PreviewModel.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/gui/preview/PreviewModel.cpp b/src/gui/preview/PreviewModel.cpp index 07c4f1f..9783ef1 100644 --- a/src/gui/preview/PreviewModel.cpp +++ b/src/gui/preview/PreviewModel.cpp @@ -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) |