libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 03:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BURIED: Clean up new scene on death to prevent memory leaks

Browse Source 
This plugs memory leak in this case
This commit is contained in:
Eugene Sandulenko 2021-03-25 15:25:34 +01:00
parent fe493acf55
commit b90a049ba0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engines/buried/scene_view.cpp
View File

@ -361,8 +361,12 @@ bool SceneViewWindow::jumpToScene(const Location &newLocation) {
SceneBase *newScene = constructSceneObject(this, newSceneStaticData, passedLocation);
if (_currentScene && _currentScene->postExitRoom(this, passedLocation) == SC_DEATH)
if (_currentScene && _currentScene->postExitRoom(this, passedLocation) == SC_DEATH) {
newScene->preDestructor();
delete newScene;
return false;
}
if (!newScene)
error("Failed to create scene");
@ -608,8 +612,11 @@ bool SceneViewWindow::moveToDestination(const DestinationScene &destinationData)
// Call the post-exit function
retVal = _currentScene->postExitRoom(this, destinationData.destinationScene);
if (retVal == SC_DEATH)
if (retVal == SC_DEATH) {
newScene->preDestructor();
delete newScene;
return false;
}
if (retVal != SC_TRUE) {
newScene->preDestructor();
@ -814,8 +821,12 @@ bool SceneViewWindow::timeSuitJump(int destination) {
if (_currentScene) {
// Post-transition function
if (_currentScene->postExitRoom(this, specOldLocation) == SC_DEATH)
if (_currentScene->postExitRoom(this, specOldLocation) == SC_DEATH) {
newScene->preDestructor();
delete newScene;
return false;
}
// Delete the old scene
_currentScene->preDestructor();