[Scummvm-git-logs] scummvm master -> 261975785743de4f3bd8d51aeb46fd3c98cd70a0

[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:
2619757857 WINTERMUTE: CID: 1010059


Commit: 261975785743de4f3bd8d51aeb46fd3c98cd70a0
    https://github.com/scummvm/scummvm/commit/261975785743de4f3bd8d51aeb46fd3c98cd70a0
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-28T14:23:03+01:00

Commit Message:
WINTERMUTE: CID: 1010059

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


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 2a1558d0954..f160275ad20 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -1991,7 +1991,7 @@ bool AdGame::branchResponseUsed(int id) const {
 	char *context = _dlgPendingBranches.size() > 0 ? _dlgPendingBranches[_dlgPendingBranches.size() - 1] : nullptr;
 	for (uint32 i = 0; i < _responsesBranch.size(); i++) {
 		if (_responsesBranch[i]->_id == id) {
-			if ((context == nullptr && _responsesBranch[i]->getContext() == nullptr) || scumm_stricmp(context, _responsesBranch[i]->getContext()) == 0) {
+			if ((context == nullptr && _responsesBranch[i]->getContext() == nullptr) || (context != nullptr && scumm_stricmp(context, _responsesBranch[i]->getContext()) == 0)) {
 				return true;
 			}
 		}
@@ -2019,7 +2019,7 @@ bool AdGame::gameResponseUsed(int id) const {
 	for (uint32 i = 0; i < _responsesGame.size(); i++) {
 		const AdResponseContext *respContext = _responsesGame[i];
 		if (respContext->_id == id) {
-			if ((context == nullptr && respContext->getContext() == nullptr) || ((context != nullptr && respContext->getContext() != nullptr) && scumm_stricmp(context, respContext->getContext()) == 0)) {
+			if ((context == nullptr && respContext->getContext() == nullptr) || ((context != nullptr && respContext->getContext() != nullptr) && (context != nullptr && scumm_stricmp(context, respContext->getContext()) == 0))) {
 				return true;
 			}
 		}