[Scummvm-cvs-logs] SF.net SVN: scummvm:[44801] scummvm/trunk/engines/sci/gui/gui_gfx.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Thu Oct 8 23:00:21 CEST 2009
Revision: 44801
http://scummvm.svn.sourceforge.net/scummvm/?rev=44801&view=rev
Author: m_kiewitz
Date: 2009-10-08 21:00:21 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
SCI/newgui: RestoreBits() now ignores empty handles
Modified Paths:
--------------
scummvm/trunk/engines/sci/gui/gui_gfx.cpp
Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp 2009-10-08 20:59:53 UTC (rev 44800)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp 2009-10-08 21:00:21 UTC (rev 44801)
@@ -606,11 +606,15 @@
}
void SciGuiGfx::RestoreBits(GuiMemoryHandle memoryHandle) {
- byte *memoryPtr = kmem(_s->_segMan, memoryHandle);;
+ byte *memoryPtr = NULL;
- if (memoryPtr) {
- _screen->restoreBits(memoryPtr);
- kfree(_s->_segMan, memoryHandle);
+ if (!memoryHandle.isNull()) {
+ memoryPtr = kmem(_s->_segMan, memoryHandle);;
+
+ if (memoryPtr) {
+ _screen->restoreBits(memoryPtr);
+ kfree(_s->_segMan, memoryHandle);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list