[Scummvm-cvs-logs] scummvm master -> f17d69f23ec6246307a4d9d898511da7e762c61c

somaen einarjohants at gmail.com
Sun Mar 24 18:33:17 CET 2013


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:
f17d69f23e WINTERMUTE: Fix random crash after save/load.


Commit: f17d69f23ec6246307a4d9d898511da7e762c61c
    https://github.com/scummvm/scummvm/commit/f17d69f23ec6246307a4d9d898511da7e762c61c
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-03-24T10:31:01-07:00

Commit Message:
WINTERMUTE: Fix random crash after save/load.

Changed paths:
    engines/wintermute/base/gfx/osystem/base_render_osystem.cpp



diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 061f527..13e2b9a 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -172,6 +172,8 @@ bool BaseRenderOSystem::flip() {
 		_dirtyRect = nullptr;
 		g_system->updateScreen();
 		_needsFlip = false;
+		_drawNum = 1;
+		addDirtyRect(_renderRect);
 		return true;
 	}
 	if (!_disableDirtyRects) {
@@ -646,6 +648,8 @@ void BaseRenderOSystem::endSaveLoad() {
 		it = _renderQueue.erase(it);
 		delete ticket;
 	}
+	_lastAddedTicket = _renderQueue.begin();
+	_previousTicket = nullptr;
 	// HACK: After a save the buffer will be drawn before the scripts get to update it,
 	// so just skip this single frame.
 	_skipThisFrame = true;






More information about the Scummvm-git-logs mailing list