Merge branch 'master' of https://github.com/WagicProject/wagic into cmake

2017-09-02 21:15:47 +02:00
parent 2b342ca33b 07e6d90c98
commit 15111d1b20
541 changed files with 95355 additions and 35840 deletions
--- a/thirdparty/zipFS/zstream.cpp
+++ b/thirdparty/zipFS/zstream.cpp
@@ -76,8 +76,8 @@ bool zbuffer::use(std::streamoff Offset, std::streamoff Size)
 		return false;

    //Don't use a buffer already used;
-    if (m_Used)
-        return false;
+	if (m_Used)
+		return false;

 	// adjust file position
 	if (! m_ZipFile.seekg(Offset, ios::beg))