[Scummvm-git-logs] scummvm master -> 25f0a9765380c2c2ce2adab7f31c4e517cc0b38d

dreammaster dreammaster at scummvm.org
Tue Dec 20 02:01:00 CET 2016


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:
25f0a97653 TITANIC: Fix crash loading games when speech is active


Commit: 25f0a9765380c2c2ce2adab7f31c4e517cc0b38d
    https://github.com/scummvm/scummvm/commit/25f0a9765380c2c2ce2adab7f31c4e517cc0b38d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-19T20:00:58-05:00

Commit Message:
TITANIC: Fix crash loading games when speech is active

Changed paths:
    engines/titanic/core/project_item.cpp


diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index af67f69..f9c7dbd 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -158,8 +158,8 @@ void CProjectItem::loadGame(int slotId) {
 	CompressedFile file;
 
 	// Clear any existing project contents and call preload code
-	clear();
 	preLoad();
+	clear();
 
 	// Open either an existing savegame slot or the new game template
 	if (slotId >= 0) {





More information about the Scummvm-git-logs mailing list