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

dreammaster dreammaster at scummvm.org
Fri Jul 4 03:01:03 CEST 2014


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:
ff84741d39 VOYEUR: Fix crash when playing video #42


Commit: ff84741d39606824d87f48c6b525fe1df83b2df1
    https://github.com/scummvm/scummvm/commit/ff84741d39606824d87f48c6b525fe1df83b2df1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-07-03T21:00:17-04:00

Commit Message:
VOYEUR: Fix crash when playing video #42

Changed paths:
    engines/voyeur/voyeur.cpp



diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 681f431..dad634c 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -556,6 +556,7 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) {
 
 	PictureResource *pic = NULL;
 	if (videoId == 42) {
+		_bVoy->getBoltGroup(0xE00);
 		_eventsManager->_videoDead = 0;
 		pic = _bVoy->boltEntry(0xE00 + _eventsManager->_videoDead)._picResource;
 	}
@@ -602,6 +603,9 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) {
 		pic->_imgData = imgData;
 		_voy->_eventFlags &= ~EVTFLAG_8;
 	}
+
+	if (videoId == 42)
+		_bVoy->freeBoltGroup(0xE00);
 }
 
 void VoyeurEngine::playAudio(int audioId) {






More information about the Scummvm-git-logs mailing list