Skip to content

Commit 5fa5052

Browse files
committed
Fix ImGui assertion failure on Alt+Tab when engine goes on pause
1 parent a1b57e1 commit 5fa5052

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

src/xrEngine/device.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,16 @@ void CRenderDevice::BeforeRender()
233233
GEnv.Render->SetCacheXform(mView, mProject);
234234
}
235235

236+
static void UpdateViewports()
237+
{
238+
// Update and Render additional Platform Windows
239+
if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
240+
{
241+
ImGui::UpdatePlatformWindows();
242+
ImGui::RenderPlatformWindowsDefault();
243+
}
244+
}
245+
236246
void CRenderDevice::DoRender()
237247
{
238248
if (GEnv.isDedicatedServer)
@@ -251,15 +261,14 @@ void CRenderDevice::DoRender()
251261

252262
ImGui::Render();
253263
m_imgui_render->Render(ImGui::GetDrawData());
254-
// Update and Render additional Platform Windows
255-
if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
256-
{
257-
ImGui::UpdatePlatformWindows();
258-
ImGui::RenderPlatformWindowsDefault();
259-
}
264+
UpdateViewports();
260265

261266
RenderEnd(); // Present goes here
262267
}
268+
else
269+
{
270+
UpdateViewports();
271+
}
263272
renderTotalReal.End();
264273
renderTotalReal.FrameEnd();
265274
stats.RenderTotal.accum = renderTotalReal.accum;

0 commit comments

Comments
 (0)