diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc index 3e0d7cee..1ab060f2 100644 --- a/Dllmain/BuildNo.rc +++ b/Dllmain/BuildNo.rc @@ -1 +1 @@ -#define BUILD_NUMBER 7123 +#define BUILD_NUMBER 7124 diff --git a/ddraw/IDirectDrawSurfaceX.cpp b/ddraw/IDirectDrawSurfaceX.cpp index dc04273b..84b67ad1 100644 --- a/ddraw/IDirectDrawSurfaceX.cpp +++ b/ddraw/IDirectDrawSurfaceX.cpp @@ -5140,7 +5140,7 @@ HRESULT m_IDirectDrawSurfaceX::PresentSurface(bool IsSkipScene) } // Check if is not primary surface or if scene should be skipped - if (ShouldWriteToGDI() || ShouldPresentToWindow(true)) + if (ShouldWriteToGDI() || ShouldPresentToWindow(true) || ddrawParent->IsInScene()) { // Never present when using Direct3D or when writing to GDI return DD_OK; @@ -5166,12 +5166,6 @@ HRESULT m_IDirectDrawSurfaceX::PresentSurface(bool IsSkipScene) // Set scene ready SceneReady = true; - // Check if device is already inscene - if (ddrawParent->IsInScene()) - { - return DD_OK; - } - // Check if surface is locked or has an open DC if (IsSurfaceBusy()) {