aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Brown <themagnificentmrb@gmail.com>2024-07-26 03:39:58 -0700
committerGitHub <noreply@github.com>2024-07-26 03:39:58 -0700
commit4ce31a772b4837bc2da85286122066bc1dae8aac (patch)
tree49f3e0fd5c66b7326b2271c71bd0aba4d66b0a42
parentfd79f9bfa2d41822d976636923cb0fa7b3135ab0 (diff)
parent50022b07c542dcf972bbba3f30bf0173ef5d6feb (diff)
Merge pull request #25451 from enen92/backport_deadlock
[backport][GUI][X11] Fix deadlock on dialog renderloop
-rw-r--r--xbmc/guilib/GUIWindowManager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp
index abf7feae25..a0cbfaa1d9 100644
--- a/xbmc/guilib/GUIWindowManager.cpp
+++ b/xbmc/guilib/GUIWindowManager.cpp
@@ -1419,7 +1419,10 @@ bool CGUIWindowManager::ProcessRenderLoop(bool renderOnly)
m_iNested++;
if (!renderOnly)
m_pCallback->Process();
- m_pCallback->FrameMove(!renderOnly);
+ {
+ CSingleExit leaveIt(CServiceBroker::GetWinSystem()->GetGfxContext());
+ m_pCallback->FrameMove(!renderOnly);
+ }
m_pCallback->Render();
m_iNested--;
}