Fix logic error

HeroponRikiBestest · HeroponRikiBestest · commit fe6eff2a01b0 · 2025-12-01T11:25:48.000-05:00
diff --git a/SabreTools.Serialization/Wrappers/RAR.Extraction.cs b/SabreTools.Serialization/Wrappers/RAR.Extraction.cs
@@ -74,8 +74,12 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
                             continue;
 
                         if (firstFile)
+                        {
                             firstFile = false;
-                        else if (entry.IsSolid)
+                            continue;
+                        }
+                        
+                        if (entry.IsSolid)
                         {
                             // If the RAR is solid and the first entry is password-protected, you won't be able to
                             // extract the rest of the entries anyway, so just return early.
@@ -86,8 +90,9 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
                             }
                             
                             isSolid = true;
-                            break;
                         }
+                        
+                        break;
                     }
                     catch (Exception ex)
                     {
diff --git a/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs b/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs
@@ -73,8 +73,12 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
                             continue;
 
                         if (firstFile)
+                        {
                             firstFile = false;
-                        else if (entry.IsSolid)
+                            continue;
+                        }
+                        
+                        if (entry.IsSolid)
                         {
                             // If the 7z is solid and the first entry is password-protected, you won't be able to
                             // extract the rest of the entries anyway, so just return early.
@@ -85,8 +89,9 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu
                             }
                             
                             isSolid = true;
-                            break;
                         }
+                        
+                        break;
                     }
                     catch (Exception ex)
                     {

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,12 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu`
`74`	`74`	`continue;`
`75`	`75`
`76`	`76`	`if (firstFile)`
	`77`	`+ {`
`77`	`78`	`firstFile = false;`
`78`		`- else if (entry.IsSolid)`
	`79`	`+ continue;`
	`80`	`+ }`
	`81`	`+`
	`82`	`+ if (entry.IsSolid)`
`79`	`83`	`{`
`80`	`84`	`// If the RAR is solid and the first entry is password-protected, you won't be able to`
`81`	`85`	`// extract the rest of the entries anyway, so just return early.`
`@@ -86,8 +90,9 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu`
`86`	`90`	`}`
`87`	`91`
`88`	`92`	`isSolid = true;`
`89`		`- break;`
`90`	`93`	`}`
	`94`	`+`
	`95`	`+ break;`
`91`	`96`	`}`
`92`	`97`	`catch (Exception ex)`
`93`	`98`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,12 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu`
`73`	`73`	`continue;`
`74`	`74`
`75`	`75`	`if (firstFile)`
	`76`	`+ {`
`76`	`77`	`firstFile = false;`
`77`		`- else if (entry.IsSolid)`
	`78`	`+ continue;`
	`79`	`+ }`
	`80`	`+`
	`81`	`+ if (entry.IsSolid)`
`78`	`82`	`{`
`79`	`83`	`// If the 7z is solid and the first entry is password-protected, you won't be able to`
`80`	`84`	`// extract the rest of the entries anyway, so just return early.`
`@@ -85,8 +89,9 @@ public bool Extract(string outputDirectory, bool lookForHeader, bool includeDebu`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`isSolid = true;`
`88`		`- break;`
`89`	`92`	`}`
	`93`	`+`
	`94`	`+ break;`
`90`	`95`	`}`
`91`	`96`	`catch (Exception ex)`
`92`	`97`	`{`