From cc33d5ff9c3db76c99ce89f745c0281651e9cb15 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Thu, 5 Mar 2026 08:26:08 +0100
Subject: [PATCH] FileWriter: Handle hdf5_mutex better

---
 writer/FileWriter.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/writer/FileWriter.cpp b/writer/FileWriter.cpp
index 25ae1c38..213b060e 100644
--- a/writer/FileWriter.cpp
+++ b/writer/FileWriter.cpp
@@ -120,11 +120,9 @@ void FileWriter::CloseOldFiles(uint64_t current_image_number) {
 }
 
 std::vector<HDF5DataFileStatistics> FileWriter::Finalize() {
-
-    if (master_file) {
-        std::lock_guard<std::mutex> lock(hdf5_mutex);
+    std::lock_guard<std::mutex> lock(hdf5_mutex);
+    if (master_file)
         master_file.reset();
-    }
 
     for (uint64_t f = 0; f < files.size(); ++f) {
         if (files[f] && !closed_files.contains(f))