Mercurial > mm7

changeset 1812:f6d6ed1c9911

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 07 Oct 2013 16:06:14 +0600
parents 8b08005c0bcd (current diff) 830f196a69ea (diff)
children 5f963bf7a771
files
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Oct 07 16:06:08 2013 +0600
+++ b/.hgignore	Mon Oct 07 16:06:14 2013 +0600
@@ -0,0 +1,4 @@
+syntax: glob
+Debug/
+Release/
+*.orig
--- a/OSWindow.cpp	Mon Oct 07 16:06:08 2013 +0600
+++ b/OSWindow.cpp	Mon Oct 07 16:06:14 2013 +0600
@@ -341,8 +341,13 @@
       return false;
 
     case WM_PAINT:
-      if ( !GetUpdateRect(api_handle, 0, 0) || !dword_4E98BC_bApplicationActive && !pRenderer->bWindowMode )
-        return *result = 0, true;
+      if (pRenderer)
+      {
+        if ( !GetUpdateRect(api_handle, 0, 0) || !dword_4E98BC_bApplicationActive && !pRenderer->bWindowMode )
+          return *result = 0, true;
+      }
+      if (!api_handle)
+        return false;
       PAINTSTRUCT Paint;
       BeginPaint(api_handle, &Paint);
       if ( pArcomageGame->bGameInProgress )