From b1fa6126cc0429aaa378550f28d234e06d35a3aa Mon Sep 17 00:00:00 2001
From: Matthew Stewart
Date: Wed, 25 Jul 2018 01:56:40 -0400
Subject: STARTREK: Link away missions together, temporarily

---
 engines/startrek/awaymission.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/startrek/awaymission.cpp')

diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp
index 41533d7bb7..c3fe9f732d 100644
--- a/engines/startrek/awaymission.cpp
+++ b/engines/startrek/awaymission.cpp
@@ -45,7 +45,7 @@ void StarTrekEngine::initAwayMission() {
 }
 
 void StarTrekEngine::runAwayMission() {
-	while (true) {
+	while (_gameMode == GAMEMODE_AWAYMISSION && !_resetGameMode) {
 		// Original game manipulates the stack when the room changes to return execution
 		// to this point. Instead of doing that, just check if a variable is set.
 		if (_roomIndexToLoad != -1 && _spawnIndexToLoad != -1) {
-- 
cgit v1.2.3