# HG changeset patch
# User Ritor1
# Date 1381140374 -21600
# Node ID f6d6ed1c99117e1e813d259c51817d4e703566a7
# Parent  8b08005c0bcdb017308ad47ac0be92fa7ab4aa08# Parent  830f196a69eaf67932c6588e1223a6a39c791f0f
Слияние

diff -r 8b08005c0bcd -r f6d6ed1c9911 .hgignore
--- 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
diff -r 8b08005c0bcd -r f6d6ed1c9911 OSWindow.cpp
--- 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 )