# HG changeset patch
# User Ritor1
# Date 1381140829 -21600
# Node ID 6de366add7579cb04f68f9ac5fce682273d27ba0
# Parent  5f963bf7a7719ed69306c9a9a84f9a9e8c2fc58e# Parent  8e17ceba3a409b74c4737378e270fad34f416158
Слияние

diff -r 5f963bf7a771 -r 6de366add757 OSWindow.cpp
--- 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);
diff -r 5f963bf7a771 -r 6de366add757 Render.cpp
--- 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 )