[Scummvm-git-logs] scummvm master -> 95638b702fe01ba77a3a0deaf1563e15cb9f17a8

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
95638b702f WINTERMUTE: Improve W/A for Alpha Polaris


Commit: 95638b702fe01ba77a3a0deaf1563e15cb9f17a8
    https://github.com/scummvm/scummvm/commit/95638b702fe01ba77a3a0deaf1563e15cb9f17a8
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-16T15:01:58+02:00

Commit Message:
WINTERMUTE: Improve W/A for Alpha Polaris

Changed paths:
    engines/wintermute/base/scriptables/script.cpp


diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 2882ec9c28f..06a784e5f45 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -635,10 +635,15 @@ bool ScScript::executeInstruction() {
 
 		if (DID_FAIL(res)) {
 
-			// W/A: Avoid crash here:
-			if (var->isNative() && var->getNative() == nullptr) {
+			// W/A: The Sprite class instance is released earlier,
+			// but a native variable still holds a reference to it,
+			// leading to call on a non-existent (freed) instance.
+			if (BaseEngine::instance().getGameId() == "alphapolaris" &&
+			        var->isNative() &&
+					strcmp(methodName, "Reset") &&
+			        strcmp(_filename, "scenes\\Out_door\\scr\\barrel.script")) {
+
 				_stack->correctParams(0);
-				runtimeError("Cannot call method '%s'. Native variable is null.", methodName);
 				_stack->pushNULL();
 				delete[] methodName;
 				break;