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

[Strangerke]

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:
e878332cc4 CRYO: Fix a bug in syncTapePointers


Commit: e878332cc4f0581343b794d8a20b396b726e3543
    https://github.com/scummvm/scummvm/commit/e878332cc4f0581343b794d8a20b396b726e3543
Author: Strangerke (strangerke at scummvm.org)
Date: 2017-02-21T00:44:38+01:00

Commit Message:
CRYO: Fix a bug in syncTapePointers

Changed paths:
    engines/cryo/eden.cpp


diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 4a051a6..a9476f8 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -6784,7 +6784,7 @@ void EdenGame::syncTapePointers(Common::Serializer s) {
 		s.syncAsUint32LE(dialogIdx);
 
 		if (s.isLoading()) {
-			_tapes[i]._perso = &_persons[persoIdx];
+			_tapes[i]._perso = (persoIdx == NULLPTR) ? nullptr : &_persons[persoIdx];
 			_tapes[i]._dialog = (dialogIdx == NULLPTR) ? nullptr : (Dialog *)getElem(_gameDialogs, dialogIdx);
 		}
 	}