[Scummvm-git-logs] scummvm master -> b3ab8263c63ddbda72fc9fc2a37ba45740f6f95c

[aquadran]

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:
b3ab8263c6 WINTERMUTE: WME3D: Aligned with original and keep a fix for original code bug


Commit: b3ab8263c63ddbda72fc9fc2a37ba45740f6f95c
    https://github.com/scummvm/scummvm/commit/b3ab8263c63ddbda72fc9fc2a37ba45740f6f95c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-26T00:35:43+02:00

Commit Message:
WINTERMUTE: WME3D: Aligned with original and keep a fix for original code bug

Changed paths:
    engines/wintermute/ad/ad_actor_3dx.cpp


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 9410b1192d0..5a6d1bb5d84 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -1136,14 +1136,14 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
 
 		case TOKEN_BLOCKED_REGION: {
 			delete _blockRegion;
+			_blockRegion = nullptr;
 			delete _currentBlockRegion;
+			_currentBlockRegion = nullptr;
 			BaseRegion *rgn = new BaseRegion(_gameRef);
 			BaseRegion *crgn = new BaseRegion(_gameRef);
 			if (!rgn || !crgn || !rgn->loadBuffer((char *)params, false)) {
 				delete rgn;
 				delete crgn;
-				_blockRegion = nullptr;
-				_currentBlockRegion = nullptr;
 				cmd = PARSERR_GENERIC;
 			} else {
 				_blockRegion = rgn;