Merge branch 'pr/161' into 1.4.3

caetera · caetera · commit 94455930f79a · 2023-06-13T20:16:24.000+02:00
diff --git a/Writer/MzMlSpectrumWriter.cs b/Writer/MzMlSpectrumWriter.cs
@@ -589,8 +589,16 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
 
                 if (_doIndexing)
                 {
-                    cryptoStream.Flush();
-                    cryptoStream.Close();
+                    try
+                    {
+                        cryptoStream.Flush();
+                        cryptoStream.Close();
+                    }
+                    catch (System.ObjectDisposedException e)
+                    {
+                        // Cannot access a closed file.  CryptoStream was already closed when closing _writer
+                        Log.Warn($"Warning: {e.Message}");
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -589,8 +589,16 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc`
`589`	`589`
`590`	`590`	`if (_doIndexing)`
`591`	`591`	`{`
`592`		`- cryptoStream.Flush();`
`593`		`- cryptoStream.Close();`
	`592`	`+ try`
	`593`	`+ {`
	`594`	`+ cryptoStream.Flush();`
	`595`	`+ cryptoStream.Close();`
	`596`	`+ }`
	`597`	`+ catch (System.ObjectDisposedException e)`
	`598`	`+ {`
	`599`	`+ // Cannot access a closed file. CryptoStream was already closed when closing _writer`
	`600`	`+ Log.Warn($"Warning: {e.Message}");`
	`601`	`+ }`
`594`	`602`	`}`
`595`	`603`	`}`
`596`	`604`