fix #1265

Siv3D · Oct 2, 2024 · 27a88e6 · 27a88e6
1 parent 28cce16
commit 27a88e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/BinaryReader/BinaryReaderDetail.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/BinaryReader/BinaryReaderDetail.cpp
@@ -246,14 +246,15 @@ namespace s3d
 			{
 				if (not m_file.file.read(static_cast<char*>(dst.pointer), readBytes))
 				{
-					m_file.pos = m_file.file.tellg();
-
 					if (m_file.file.eof())
 					{
+						setPos(previousPos);
 						return readBytes;
 					}
 
 					LOG_FAIL(U"❌ BinaryReader `{0}`: ReadFile() failed"_fmt(m_info.fullPath));
+
+					setPos(previousPos); 
 					return 0;
 				}
 			}
@@ -286,14 +287,15 @@ namespace s3d
 			{
 				if (not m_file.file.read(static_cast<char*>(dst.pointer), readBytes))
 				{
-					m_file.pos = m_file.file.tellg();
-
 					if (m_file.file.eof())
 					{
+						setPos(previousPos);
 						return readBytes;
 					}
 
 					LOG_FAIL(U"❌ BinaryReader `{0}`: ReadFile() failed"_fmt(m_info.fullPath));
+
+					setPos(previousPos);
 					return 0;
 				}
 			}

diff --git a/Siv3D/src/Siv3D-Platform/macOS_Linux/Siv3D/BinaryReader/BinaryReaderDetail.cpp b/Siv3D/src/Siv3D-Platform/macOS_Linux/Siv3D/BinaryReader/BinaryReaderDetail.cpp
@@ -161,14 +161,15 @@ namespace s3d
 		{
 			if (not m_file.file.read(static_cast<char*>(dst.pointer), readBytes))
 			{
-				m_file.pos = m_file.file.tellg();
-
 				if (m_file.file.eof())
 				{
+					setPos(previousPos);
 					return readBytes;
 				}
 
 				LOG_FAIL(U"❌ BinaryReader `{0}`: ReadFile() failed"_fmt(m_info.fullPath));
+
+				setPos(previousPos);
 				return 0;
 			}
 		}
@@ -192,14 +193,15 @@ namespace s3d
 		{
 			if (not m_file.file.read(static_cast<char*>(dst.pointer), readBytes))
 			{
-				m_file.pos = m_file.file.tellg();
-
 				if (m_file.file.eof())
 				{
+					setPos(previousPos);
 					return readBytes;
 				}
 
 				LOG_FAIL(U"❌ BinaryReader `{0}`: ReadFile() failed"_fmt(m_info.fullPath));
+
+				setPos(previousPos);
 				return 0;
 			}
 		}