Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main

This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2021-03-05 19:27:14 -04:00
parent 68face5e2b
commit 8f73cd7fa9
1746 changed files with 97388 additions and 29865 deletions

View File

@@ -482,15 +482,15 @@ void FPreLoadScreenManager::EarlyPlayRenderFrameTick()
{
bool bIsResponsibleForRendering_Local = true;
if (!bRenderingEnabled)
if (!bRenderingEnabled || !FSlateApplication::IsInitialized())
{
// In this case FPreLoadScreenManager is responsible for rendering but choosing not to, probably because the
// If rendering disabled, FPreLoadScreenManager is responsible for rendering but choosing not to, probably because the
// app is not in the foreground.
return;
}
if (!FSlateApplication::IsInitialized())
{
// Cycle lock to give a chance to another thread to re-enable rendering.
AcquireCriticalSection.Unlock();
FPlatformProcess::Sleep(0);
AcquireCriticalSection.Lock();
return;
}