v0.3.3.1v0.3.3.1

5 files changed, 13 insertions, 8 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb63901..c6d41e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 21/05/2020 - v0.3.3.1 - Beta
+
+* (Fix) Unable to convert Chitubox or PHZ files when enconter repeated layer images
+
 ## 19/05/2020 - v0.3.3 - Beta
 
 * (Add) PHZ file format
@@ -8,8 +12,8 @@
 * (Add) Convert Chitubox and PHZ files to ZCodex
 * (Add) Elapsed seconds to convertion and extract dialog
 * (Improvement) "Convert To" menu now only show available formats to convert to, if none menu is disabled
-* (Fixed) Enforce cbt encryption
-* (Fixed) Not implemented convertions stay processing forever
+* (Fix) Enforce cbt encryption
+* (Fix) Not implemented convertions stay processing forever
 
 
 ## 11/05/2020 - v0.3.2 - Beta
diff --git a/PrusaSL1Reader/ChituboxFile.cs b/PrusaSL1Reader/ChituboxFile.cs
index 794f2ed..0e853b0 100644
--- a/PrusaSL1Reader/ChituboxFile.cs
+++ b/PrusaSL1Reader/ChituboxFile.cs
@@ -743,7 +743,7 @@ namespace PrusaSL1Reader
 
                     currentOffset += Helpers.SerializeWriteFileStream(outputFile, layer);
 
-                    if (!ReferenceEquals(layerHash, null)) return;
+                    if (!ReferenceEquals(layerHash, null)) continue;
 
                     outputFile.Seek(layerDataCurrentOffset, SeekOrigin.Begin);
                     layerDataCurrentOffset += Helpers.WriteFileStream(outputFile, byteArr);
diff --git a/PrusaSL1Reader/PHZFile.cs b/PrusaSL1Reader/PHZFile.cs
index e6c24a3..c159694 100644
--- a/PrusaSL1Reader/PHZFile.cs
+++ b/PrusaSL1Reader/PHZFile.cs
@@ -506,6 +506,7 @@ namespace PrusaSL1Reader
             base.Encode(fileFullPath);
             LayersHash.Clear();
 
+            
             uint currentOffset = (uint)Helpers.Serializer.SizeOf(HeaderSettings);
             LayersDefinitions = new Layer[HeaderSettings.LayerCount, HeaderSettings.AntiAliasLevel];
             using (var outputFile = new FileStream(fileFullPath, FileMode.Create, FileAccess.Write))
@@ -653,7 +654,7 @@ namespace PrusaSL1Reader
 
                     currentOffset += Helpers.SerializeWriteFileStream(outputFile, layer);
 
-                    if (!ReferenceEquals(layerHash, null)) return;
+                    if (!ReferenceEquals(layerHash, null)) continue;
 
                     outputFile.Seek(layerDataCurrentOffset, SeekOrigin.Begin);
                     layerDataCurrentOffset += Helpers.WriteFileStream(outputFile, byteArr);
diff --git a/PrusaSL1Reader/PrusaSL1Reader.csproj b/PrusaSL1Reader/PrusaSL1Reader.csproj
index 77e77d0..b491084 100644
--- a/PrusaSL1Reader/PrusaSL1Reader.csproj
+++ b/PrusaSL1Reader/PrusaSL1Reader.csproj
@@ -7,9 +7,9 @@
     <PackageProjectUrl>https://github.com/sn4k3/PrusaSL1Viewer</PackageProjectUrl>
     <PackageIcon></PackageIcon>
     <RepositoryUrl>https://github.com/sn4k3/PrusaSL1Viewer</RepositoryUrl>
-    <AssemblyVersion>0.3.3.0</AssemblyVersion>
+    <AssemblyVersion>0.3.3.1</AssemblyVersion>
     <FileVersion>0.3.3.0</FileVersion>
-    <Version>0.3.3</Version>
+    <Version>0.3.3.1</Version>
     <Description>Open, view, edit, extract and convert DLP/SLA files generated from Slicers</Description>
   </PropertyGroup>
 
diff --git a/PrusaSL1Viewer/Properties/AssemblyInfo.cs b/PrusaSL1Viewer/Properties/AssemblyInfo.cs
index 8fcd116..19fd0f5 100644
--- a/PrusaSL1Viewer/Properties/AssemblyInfo.cs
+++ b/PrusaSL1Viewer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.3.0")]
-[assembly: AssemblyFileVersion("0.3.3.0")]
+[assembly: AssemblyVersion("0.3.3.1")]
+[assembly: AssemblyFileVersion("0.3.3.1")]