[Scummvm-cvs-logs] SF.net SVN: scummvm:[45869] scummvm/trunk/engines/sci/gui/gui_menu.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 45869
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45869&view=rev
Author:   m_kiewitz
Date:     2009-11-12 19:27:26 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
SCI/newgui: SciGuiMenu forgot to reset memory handles after restoring

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_menu.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_menu.cpp	2009-11-12 19:16:55 UTC (rev 45868)
+++ scummvm/trunk/engines/sci/gui/gui_menu.cpp	2009-11-12 19:27:26 UTC (rev 45869)
@@ -51,6 +51,7 @@
 	_curItemId = 1;
 
 	_menuSaveHandle = NULL_REG;
+	_barSaveHandle = NULL_REG;
 	_oldPort = NULL;
 }
 
@@ -389,11 +390,13 @@
 	if (!_menuSaveHandle.isNull()) {
 		_gfx->BitsRestore(_menuSaveHandle);
 		_gfx->BitsShow(_menuRect);
+		_menuSaveHandle = NULL_REG;
 		// TODO: Change to ReAnimate()
 	}
 	if (!_barSaveHandle.isNull()) {
 		_gfx->BitsRestore(_barSaveHandle);
 		_gfx->BitsShow(_gfx->_menuBarRect);
+		_barSaveHandle = NULL_REG;
 	}
 	if (_oldPort)
 		_gfx->SetPort(_oldPort);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.