[Scummvm-git-logs] scummvm master -> 2194986f1b903496ee1ffca076d34e841e4cd839

[rvanlaar]

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:
2194986f1b TESTBED: fix decoding second frame


Commit: 2194986f1b903496ee1ffca076d34e841e4cd839
    https://github.com/scummvm/scummvm/commit/2194986f1b903496ee1ffca076d34e841e4cd839
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-09-28T23:17:54+02:00

Commit Message:
TESTBED: fix decoding second frame

A segfault happened on decoding the second frame because
frame was deleted when it is expected to exist.

Changed paths:
    engines/testbed/video.cpp


diff --git a/engines/testbed/video.cpp b/engines/testbed/video.cpp
index d228ce496bb..2c27eaeab3e 100644
--- a/engines/testbed/video.cpp
+++ b/engines/testbed/video.cpp
@@ -70,23 +70,22 @@ void TestbedEngine::videoTest() {
 				g_system->copyRectToScreen(conv->getPixels(), conv->pitch, x, y, MIN<uint16>(conv->w, 640), MIN<uint16>(conv->h, 480));
 
 				delete conv;
-				delete frame;
 			}
 
 			Common::Event event;
 
 			while (g_system->getEventManager()->pollEvent(event)) {
 				if (Engine::shouldQuit()) {
+					video->close();
 					delete video;
 					return;
 				}
 			}
-
 			g_system->updateScreen();
 			g_system->delayMillis(10);
 		}
 	}
-
+	video->close();
 	delete video;
 }