Merge branch 'master' of https://github.com/IcySon55/Kuriimu

IcySon55 · Aug 21, 2017 · df869b8 · df869b8
2 parents f5f6f8d + 8cd31fb
commit df869b8
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/archive/archive_cdar/CdarSupport.cs b/src/archive/archive_cdar/CdarSupport.cs
@@ -15,12 +15,12 @@ public override Stream FileData
         {
             get
             {
-                if (State != ArchiveFileState.Archived) return base.FileData;
+                if (State != ArchiveFileState.Archived || entry.decompSize == 0) return base.FileData;
                 return new MemoryStream(ZLib.Decompress(base.FileData));
             }
         }
 
-        public override long? FileSize => entry.decompSize;
+        public override long? FileSize => (entry.decompSize == 0) ? entry.compSize : entry.decompSize;
 
         public void Write(Stream input, uint offset)
         {
@@ -35,13 +35,24 @@ public void Write(Stream input, uint offset)
                 }
                 else
                 {
-                    entry.offset = offset;
-                    entry.decompSize = (uint)base.FileData.Length;
-                    var comp = ZLib.Compress(base.FileData);
-                    entry.compSize = (uint)comp.Length;
-                    bw.Write(comp);
+                    if (entry.decompSize == 0)
+                    {
+                        entry.offset = offset;
+                        entry.compSize = (uint)base.FileData.Length;
+                        base.FileData.CopyTo(bw.BaseStream);
 
-                    bw.WriteAlignment();
+                        bw.WriteAlignment();
+                    }
+                    else
+                    {
+                        entry.offset = offset;
+                        entry.decompSize = (uint)base.FileData.Length;
+                        var comp = ZLib.Compress(base.FileData);
+                        entry.compSize = (uint)comp.Length;
+                        bw.Write(comp);
+
+                        bw.WriteAlignment();
+                    }
                 }
             }
         }