[Scummvm-git-logs] scummvm master -> bc8b952d7169820213551dcdacccbebb66e1d84a

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bc8b952d71 GRAPHICS: MACGUI: Perform sanity checks before blitting


Commit: bc8b952d7169820213551dcdacccbebb66e1d84a
    https://github.com/scummvm/scummvm/commit/bc8b952d7169820213551dcdacccbebb66e1d84a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-18T10:17:52+02:00

Commit Message:
GRAPHICS: MACGUI: Perform sanity checks before blitting

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 9a3e711..8eaf8e9 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -289,8 +289,10 @@ void MacWindowManager::draw() {
 
 			Common::Rect clip(w->getDimensions().left - 2, w->getDimensions().top - 2, w->getDimensions().right - 2, w->getDimensions().bottom - 2);
 			clip.clip(_screen->getBounds());
+			clip.clip(Common::Rect(0, 0, g_system->getWidth() - 1, g_system->getHeight() - 1));
 
-			g_system->copyRectToScreen(_screen->getBasePtr(clip.left, clip.top), _screen->pitch, clip.left, clip.top, clip.width(), clip.height());
+			if (!clip.isEmpty())
+				g_system->copyRectToScreen(_screen->getBasePtr(clip.left, clip.top), _screen->pitch, clip.left, clip.top, clip.width(), clip.height());
 		}
 	}