Limit scene creation context, ensure scene end

Lpsd · Jan 16, 2025 · bb6c882 · bb6c882
1 parent 47034c5
commit bb6c882
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Client/gui/CGUI_Impl.cpp b/Client/gui/CGUI_Impl.cpp
@@ -398,7 +398,8 @@ bool CGUI_Impl::ConvertToModernSkin(const char* skinName)
         renderManager->CreateRenderTarget(width, std::max(modernImagesetTexture->m_uiSizeY, skinImagesetTexture->m_uiSizeY), false, true, 0, true);
 
     auto device = m_pGraphics->GetDevice();
-    if (device->BeginScene() != D3D_OK)
+
+    if (!m_HasSchemeLoaded && device->BeginScene() != D3D_OK)
     {
         AddReportLog(1337, "ConvertToModernSkin: Failed to begin scene for imageset drawing");
         return false;
@@ -414,6 +415,12 @@ bool CGUI_Impl::ConvertToModernSkin(const char* skinName)
     // Stop draw batch
     renderManager->RestoreDefaultRenderTarget();
 
+    if (!m_HasSchemeLoaded && device->EndScene() != D3D_OK)
+    {
+        AddReportLog(1337, "ConvertToModernSkin: Failed to end scene for imageset drawing");
+        return false;
+    }
+
     D3DXSaveTextureToFile(tempImagesetPngPath, D3DXIFF_PNG, renderTarget->m_pD3DTexture, 0);
 
     if (!FileExists(tempImagesetPngPath))