From b4b45835b016eb9bc8690d06894d1e95e140393f Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 11 Oct 2016 18:32:34 +0200 Subject: [PATCH] Delete thread when it's cleaned up, not automatically --- qrenderdoc/Code/CaptureContext.h | 1 - qrenderdoc/Code/RenderManager.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h index 6d73bc758..1e5d0684e 100644 --- a/qrenderdoc/Code/CaptureContext.h +++ b/qrenderdoc/Code/CaptureContext.h @@ -235,7 +235,6 @@ public slots: { m_func(); m_Thread->quit(); - deleteLater(); m_Thread->deleteLater(); m_Thread = NULL; } diff --git a/qrenderdoc/Code/RenderManager.cpp b/qrenderdoc/Code/RenderManager.cpp index 8a89068c9..85cc2dcd1 100644 --- a/qrenderdoc/Code/RenderManager.cpp +++ b/qrenderdoc/Code/RenderManager.cpp @@ -94,8 +94,7 @@ void RenderManager::CloseThread() { } - // the thread deletes itself, don't delete here - + m_Thread->deleteLater(); m_Thread = NULL; }