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

[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:
a69eebe53b SHERLOCK: SS: Fix German journal crash moving tobacco box


Commit: a69eebe53b2add4e98e3c875180e13c194b9d73b
    https://github.com/scummvm/scummvm/commit/a69eebe53b2add4e98e3c875180e13c194b9d73b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-03T15:44:58-04:00

Commit Message:
SHERLOCK: SS: Fix German journal crash moving tobacco box

Changed paths:
    engines/sherlock/journal.cpp



diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 8763af3..7c2d1c2 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -438,8 +438,9 @@ void Journal::loadJournalFile(bool alreadyLoaded) {
 			}
 		}
 
-		// Is it a control character?
-		if (isPrintable(c)) {
+		if (c == '\r' || c == '\n') {
+			journalString += '\n';
+		} else if (isPrintable(c)) {
 			// Nope. Set flag for allowing control codes to insert spaces
 			ctrlSpace = true;
 			justChangedSpeaker = false;