From 8e2c60790437d4df583a236c99e856d21dbc0dfe Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Thu, 9 Jan 2025 17:15:57 +0100
Subject: [PATCH] fix: Execute HP onProtocolEnter callback after HPservice.run(
 (#4589)

---
 .../HangingProtocolService.ts                     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts b/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
index 10bc77344..85bf21f4f 100644
--- a/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
+++ b/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
@@ -406,15 +406,16 @@ export default class HangingProtocolService extends PubSubService {
     if (protocolId && typeof protocolId === 'string') {
       const protocol = this.getProtocolById(protocolId);
       this._setProtocol(protocol, options);
-      return;
+    }else {
+      const matchedProtocol = this.protocolEngine.run({
+        studies: this.studies,
+        activeStudy,
+        displaySets,
+      });
+      this._setProtocol(matchedProtocol);
     }
 
-    const matchedProtocol = this.protocolEngine.run({
-      studies: this.studies,
-      activeStudy,
-      displaySets,
-    });
-    this._setProtocol(matchedProtocol);
+    this._commandsManager.run(this.protocol?.callbacks?.onProtocolEnter);
   }
 
   /**