From 6e5b058fc1a51714c11e93cdf04df28fe9059882 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Thu, 13 Mar 2025 13:17:54 +0100
Subject: [PATCH] merge fix

---
 slsReceiverSoftware/src/DataProcessor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp
index 712956c0d..657bbb98f 100644
--- a/slsReceiverSoftware/src/DataProcessor.cpp
+++ b/slsReceiverSoftware/src/DataProcessor.cpp
@@ -361,7 +361,7 @@ void DataProcessor::ProcessAnImage(sls_receiver_header &header, size_t &size,
     // rearrange ctb digital bits
     if (!ctbDbitList.empty()) {
         ArrangeDbitData(size, data);
-    } else if (reorder) {
+    } else if (ctbDbitReorder) {
         Reorder(size, data);
     } else if (ctbDbitOffset > 0) {
         RemoveTrailingBits(size, data);