From 028bdfa4f7c7572421e887aeeeb71d193aeab576 Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Fri, 22 Apr 2016 14:25:15 +0300 Subject: Fix deadlock when quitting aspect manager Stop waiting for next frame advance if we are about to shut down. Change-Id: I334c5afa69eb262d6e4e7139acc826fbd7aa9263 Task-number: QTBUG-50044 Reviewed-by: Sean Harmer --- src/render/services/vsyncframeadvanceservice.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/render/services') diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp index af97993db..533b0fba1 100644 --- a/src/render/services/vsyncframeadvanceservice.cpp +++ b/src/render/services/vsyncframeadvanceservice.cpp @@ -100,8 +100,7 @@ void VSyncFrameAdvanceService::start() void VSyncFrameAdvanceService::stop() { Q_D(VSyncFrameAdvanceService); - if (d->m_semaphore.available() == 0) - d->m_semaphore.release(1); + d->m_semaphore.release(1); qCDebug(VSyncAdvanceService) << "Terminating VSyncFrameAdvanceService"; } -- cgit v1.2.3