From e65e355d900a9038b5f83ca1db86fae9503ba0e8 Mon Sep 17 00:00:00 2001 From: low-batt <86170219+low-batt@users.noreply.github.com> Date: Fri, 31 Dec 2021 21:55:25 -0500 Subject: [PATCH] Fix deadlock in ViewLayer.draw methods, #11 Resolved merge conflicts. The commit changes the order of acquiring locks in both of the ViewLayer draw methods to first lock the OpenGL context before locking uninitLock. --- iina/ViewLayer.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/iina/ViewLayer.swift b/iina/ViewLayer.swift index 9ac06b2d67a..8ed50fbc779 100644 --- a/iina/ViewLayer.swift +++ b/iina/ViewLayer.swift @@ -164,7 +164,6 @@ class ViewLayer: CAOpenGLLayer { ] mpv_render_context_render(renderContext, ¶ms); } - videoView.player.mpv?.unlockOpenGLContext() } needsMPVRender = false }