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

[dreammaster]

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:
d7ca77fe6c MM: MM1: Fix selecting char from QUickRef


Commit: d7ca77fe6c5fca6dde88c502e0efd1c680dd5fe1
    https://github.com/scummvm/scummvm/commit/d7ca77fe6c5fca6dde88c502e0efd1c680dd5fe1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-13T23:15:24-07:00

Commit Message:
MM: MM1: Fix selecting char from QUickRef

Changed paths:
    engines/mm/mm1/views_enh/quick_ref.cpp


diff --git a/engines/mm/mm1/views_enh/quick_ref.cpp b/engines/mm/mm1/views_enh/quick_ref.cpp
index 72ff404150a..7ef30940990 100644
--- a/engines/mm/mm1/views_enh/quick_ref.cpp
+++ b/engines/mm/mm1/views_enh/quick_ref.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "mm/mm1/views_enh/quick_ref.h"
+#include "mm/mm1/views_enh/character_info.h"
 #include "mm/mm1/maps/maps.h"
 #include "mm/mm1/globals.h"
 
@@ -120,6 +121,11 @@ bool QuickRef::msgAction(const ActionMessage &msg) {
 	{
 		uint charNum = msg._action - KEYBIND_VIEW_PARTY1;
 		if (charNum < g_globals->_party.size()) {
+			// If the quickref was launched from a character view,
+			// close QuickRef so the replaceView below replaces it
+			if (dynamic_cast<CharacterInfo *>(g_events->priorView()) != nullptr)
+				close();
+
 			if (isInCombat()) {
 				g_globals->_currCharacter = g_globals->_combatParty[charNum];
 				replaceView("CharacterViewCombat");