[[ Bug 13145 ]] ImageData display by reference hangs 7DP9

livecodesebastien · livecodesebastien · commit 663b5382eb33 · 2014-08-11T11:24:57.000+01:00
diff --git a/docs/notes/bugfix-13145.md b/docs/notes/bugfix-13145.md
@@ -0,0 +1 @@
+#  ImageData display by reference hangs 7DP9
diff --git a/engine/src/dskw32.cpp b/engine/src/dskw32.cpp
@@ -1525,6 +1525,16 @@ struct MCStdioFileHandle: public MCSystemFileHandle
 					return false;
 				}
 				
+				// SN-2014-08-11: [[ Bug 13145 ]] If ReadFile can't read more, but no error is triggered, we should stop here,
+				//  but return true. The new imageLoader reads buffer by buffer, and doesn't expect and error when reading the
+				//  the last buffer (which might ask for more than remaining in the file).
+				if (nread == 0 && GetLastError() == 0)
+				{
+					r_read = t_offset;
+					m_is_eof = true;
+					return true;
+				}
+
 				t_remaining -= nread;
 			}
 			nread = t_offset;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# ImageData display by reference hangs 7DP9`