Clean up after extraction cancellation

jcaillon · jcaillon · commit 6a9c4f61accb · 2018-10-21T16:06:24.000+02:00
diff --git a/CabinetManager/core/CfCabinet.cs b/CabinetManager/core/CfCabinet.cs
@@ -325,10 +325,11 @@ void Progress(CfSaveEventArgs args) {
 
             try {
                 fileToExtract.Parent.ExtractFileFromDataBlocks(_reader, relativePathInCab, extractionPath, _cancelToken, Progress);
-            } finally {
+            } catch(OperationCanceledException) {
                 if (File.Exists(extractionPath)) {
                     File.Delete(extractionPath);
                 }
+                throw;
             }
             
             File.SetCreationTime(extractionPath, fileToExtract.FileDateTime);

Original file line number	Diff line number	Diff line change
`@@ -325,10 +325,11 @@ void Progress(CfSaveEventArgs args) {`
`325`	`325`
`326`	`326`	`try {`
`327`	`327`	`fileToExtract.Parent.ExtractFileFromDataBlocks(_reader, relativePathInCab, extractionPath, _cancelToken, Progress);`
`328`		`- } finally {`
	`328`	`+ } catch(OperationCanceledException) {`
`329`	`329`	`if (File.Exists(extractionPath)) {`
`330`	`330`	`File.Delete(extractionPath);`
`331`	`331`	`}`
	`332`	`+ throw;`
`332`	`333`	`}`
`333`	`334`
`334`	`335`	`File.SetCreationTime(extractionPath, fileToExtract.FileDateTime);`