From edd63137ab9cb7146b2f413cef9600af9122e224 Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Thu, 20 Jun 2019 10:11:44 +0300
Subject: BLADERUNNER: Try and close all TLK on shutdown always

---
 engines/bladerunner/chapters.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'engines/bladerunner/chapters.cpp')

diff --git a/engines/bladerunner/chapters.cpp b/engines/bladerunner/chapters.cpp
index 7cf7c5e0f5..f063801451 100644
--- a/engines/bladerunner/chapters.cpp
+++ b/engines/bladerunner/chapters.cpp
@@ -71,14 +71,13 @@ void Chapters::closeResources() {
 	}
 #endif // BLADERUNNER_ORIGINAL_BUGS
 	_vm->closeArchive(Common::String::format("VQA%d.MIX", MIN(id, 3)));
-	if (_vm->_cutContent) {
-		for (int chi = 1; chi < 4; ++chi) {
-			if (_vm->isArchiveOpen(Common::String::format("%d.TLK", chi))) {
-				_vm->closeArchive(Common::String::format("%d.TLK", chi));
-			}
+	// It's better to try and close every TLK file here (if open), since
+	// when switching from Restored Content version to Original (due to a save game load)
+	// TLK files would still remain open -- and should still be closed here
+	for (int chi = 1; chi < 4; ++chi) {
+		if (_vm->isArchiveOpen(Common::String::format("%d.TLK", chi))) {
+			_vm->closeArchive(Common::String::format("%d.TLK", chi));
 		}
-	} else {
-		_vm->closeArchive(Common::String::format("%d.TLK", MIN(id, 3)));
 	}
 	_vm->closeArchive(Common::String::format("OUTTAKE%d.MIX", id));
 	_hasOpenResources = false;
-- 
cgit v1.2.3