[Scummvm-cvs-logs] scummvm master -> 51ac9cadd4aa4aa0dcbafe1ab1e65db89ae2238c

[urukgit]

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:
51ac9cadd4 CGE: Fix EncryptedStream::err().


Commit: 51ac9cadd4aa4aa0dcbafe1ab1e65db89ae2238c
    https://github.com/scummvm/scummvm/commit/51ac9cadd4aa4aa0dcbafe1ab1e65db89ae2238c
Author: uruk (koppirnyo at gmail.com)
Date: 2014-08-11T16:16:54+02:00

Commit Message:
CGE: Fix EncryptedStream::err().

Changed paths:
    engines/cge/fileio.cpp



diff --git a/engines/cge/fileio.cpp b/engines/cge/fileio.cpp
index 2b1f74d..d910e27 100644
--- a/engines/cge/fileio.cpp
+++ b/engines/cge/fileio.cpp
@@ -228,7 +228,7 @@ uint32 EncryptedStream::read(byte *dataPtr, uint32 dataSize) {
 }
 
 bool EncryptedStream::err() {
-	return (_error & _readStream->err());
+	return (_error || _readStream->err());
 }
 
 bool EncryptedStream::eos() {