Mercurial > mm7

changeset 1814:6de366add757

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 07 Oct 2013 16:13:49 +0600
parents 5f963bf7a771 (current diff) 8e17ceba3a40 (diff)
children 9442b7c19a64 f3b106aff057
files Render.cpp
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OSWindow.cpp	Mon Oct 07 16:13:32 2013 +0600
+++ b/OSWindow.cpp	Mon Oct 07 16:13:49 2013 +0600
@@ -346,7 +346,7 @@
         if ( !GetUpdateRect(api_handle, 0, 0) || !dword_4E98BC_bApplicationActive && !pRenderer->bWindowMode )
           return *result = 0, true;
       }
-      if (!api_handle)
+      if (!api_handle || !pRenderer)
         return false;
       PAINTSTRUCT Paint;
       BeginPaint(api_handle, &Paint);
--- a/Render.cpp	Mon Oct 07 16:13:32 2013 +0600
+++ b/Render.cpp	Mon Oct 07 16:13:49 2013 +0600
@@ -177,11 +177,13 @@
 }
 
 //----- (004A16A5) --------------------------------------------------------
-bool  AreRenderSurfacesOk()
+bool AreRenderSurfacesOk()
 {
   char v0; // zf@4
   bool result; // eax@8
 
+  if (!pRenderer)
+    return true;
   if ( pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || pVersion->pVersionInfo.dwMajorVersion != 4 )
   {
     if ( !pRenderer->pBackBuffer4 )