Include the stream::tell() method call in the thread lock guard to fi…

…x the intermittent parsing errors. Fix wrong file name.
codereader · Aug 31, 2017 · d6d28b0 · d6d28b0
1 parent 4b6e3e2
commit d6d28b0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/plugins/archivezip/StoreArchiveFile.h → plugins/archivezip/StoredArchiveFile.h b/plugins/archivezip/StoreArchiveFile.h → plugins/archivezip/StoredArchiveFile.h
diff --git a/plugins/archivezip/ZipArchive.cpp b/plugins/archivezip/ZipArchive.cpp
@@ -12,7 +12,7 @@
 #include "ZipStreamUtils.h"
 #include "DeflatedArchiveFile.h"
 #include "DeflatedArchiveTextFile.h"
-#include "StoreArchiveFile.h"
+#include "StoredArchiveFile.h"
 #include "StoredArchiveTextFile.h"
 
 namespace archive
@@ -104,20 +104,18 @@ ArchiveTextFilePtr ZipArchive::openTextFile(const std::string& name)
 	{
 		const std::shared_ptr<ZipRecord>& file = i->second.getRecord();
 
-		{
-			// Guard against concurrent access
-			std::lock_guard<std::mutex> lock(_streamLock);
+		// Guard against concurrent access
+		std::lock_guard<std::mutex> lock(_streamLock);
 
-			_istream.seek(file->position);
+		_istream.seek(file->position);
 
-			ZipFileHeader header;
-			stream::readZipFileHeader(_istream, header);
+		ZipFileHeader header;
+		stream::readZipFileHeader(_istream, header);
 
-			if (header.magic != ZIP_MAGIC_FILE_HEADER)
-			{
-				rError() << "Error reading zip file " << _fullPath << std::endl;
-				return ArchiveTextFilePtr();
-			}
+		if (header.magic != ZIP_MAGIC_FILE_HEADER)
+		{
+			rError() << "Error reading zip file " << _fullPath << std::endl;
+			return ArchiveTextFilePtr();
 		}
 
 		std::string modDir = game::current::getModPath(_containingFolder);

diff --git a/tools/msvc/archivezip.vcxproj b/tools/msvc/archivezip.vcxproj
@@ -311,7 +311,7 @@
     <ClInclude Include="..\..\plugins\archivezip\DeflatedArchiveTextFile.h" />
     <ClInclude Include="..\..\plugins\archivezip\DeflatedInputStream.h" />
     <ClInclude Include="..\..\plugins\archivezip\GenericFileSystem.h" />
-    <ClInclude Include="..\..\plugins\archivezip\StoreArchiveFile.h" />
+    <ClInclude Include="..\..\plugins\archivezip\StoredArchiveFile.h" />
     <ClInclude Include="..\..\plugins\archivezip\StoredArchiveTextFile.h" />
     <ClInclude Include="..\..\plugins\archivezip\ZipArchive.h" />
     <ClInclude Include="..\..\plugins\archivezip\ZipStreamUtils.h" />

diff --git a/tools/msvc/archivezip.vcxproj.filters b/tools/msvc/archivezip.vcxproj.filters
@@ -25,10 +25,10 @@
     <ClInclude Include="..\..\plugins\archivezip\DeflatedInputStream.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\plugins\archivezip\StoreArchiveFile.h">
+    <ClInclude Include="..\..\plugins\archivezip\StoredArchiveTextFile.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\plugins\archivezip\StoredArchiveTextFile.h">
+    <ClInclude Include="..\..\plugins\archivezip\StoredArchiveFile.h">
       <Filter>src</Filter>
     </ClInclude>
   </ItemGroup>