From c1cef1e9077b740b18c239bd6b60479a3cd907f9 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Thu, 5 Mar 2026 20:45:03 +0100
Subject: [PATCH] ZMQStream2Pusher: Clear handling of images written if no
 notification socket

---
 image_pusher/ZMQStream2Pusher.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/image_pusher/ZMQStream2Pusher.cpp b/image_pusher/ZMQStream2Pusher.cpp
index 25854208..ab4ce8f7 100644
--- a/image_pusher/ZMQStream2Pusher.cpp
+++ b/image_pusher/ZMQStream2Pusher.cpp
@@ -98,6 +98,7 @@ std::string ZMQStream2Pusher::Finalize() {
     if (transmission_error)
         ret += "Timeout sending images (e.g., writer disabled during data collection);";
     uint64_t images = 0;
+    bool images_saved = false;
     if (writer_notification_socket) {
         for (int i = 0; i < socket.size(); i++) {
             auto n = writer_notification_socket->Receive(run_number, run_name);
@@ -109,13 +110,17 @@ std::string ZMQStream2Pusher::Finalize() {
                 if (!n->ok)
                     ret += "Writer " + std::to_string(i) + ": " + n->error;
                 images += n->processed_images;
+                images_saved = true;
             }
         }
     }
 
     {
         std::unique_lock ul(images_written_mutex);
-        images_written = images;
+        if (images_saved)
+            images_written = images;
+        else
+            images_written = std::nullopt;
     }
     return ret;
 }