Free renderer properly when initialized partway

The intialization of threading stuff can (theoretically) fail, so we should handle it properly here.
drawpile · Aug 17, 2023 · 9140fb6 · 9140fb6
1 parent 09c3b1d
commit 9140fb6
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/drawdance/libengine/dpengine/renderer.c b/src/drawdance/libengine/dpengine/renderer.c
@@ -383,16 +383,17 @@ void DP_renderer_free(DP_Renderer *renderer)
 {
     if (renderer) {
         int thread_count = renderer->thread_count;
-        DP_MUTEX_MUST_LOCK(renderer->queue_mutex);
-        DP_queue_clear(&renderer->blocking_queue, sizeof(DP_RenderJob),
-                       dispose_blocking_job);
-        renderer->tile.queue_high.used = 0;
-        renderer->tile.queue_low.used = 0;
-        DP_SEMAPHORE_MUST_POST_N(renderer->queue_sem, thread_count);
-        DP_MUTEX_MUST_UNLOCK(renderer->queue_mutex);
-
-        for (int i = 0; i < thread_count; ++i) {
-            DP_thread_free_join(renderer->threads[i]);
+        if (renderer->queue_mutex && renderer->queue_sem) {
+            DP_MUTEX_MUST_LOCK(renderer->queue_mutex);
+            DP_queue_clear(&renderer->blocking_queue, sizeof(DP_RenderJob),
+                           dispose_blocking_job);
+            renderer->tile.queue_high.used = 0;
+            renderer->tile.queue_low.used = 0;
+            DP_SEMAPHORE_MUST_POST_N(renderer->queue_sem, thread_count);
+            DP_MUTEX_MUST_UNLOCK(renderer->queue_mutex);
+            for (int i = 0; i < thread_count; ++i) {
+                DP_thread_free_join(renderer->threads[i]);
+            }
         }
         DP_semaphore_free(renderer->wait_done_sem);
         DP_semaphore_free(renderer->wait_ready_sem);