From 00cb623a67059bf13429bfd9d68aba93cf8ee24e Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Wed, 2 Oct 2024 12:06:59 +0100
Subject: [PATCH] SWDEV-488851 - Correctly remove the queue from the active set
 on windows

Change-Id: I4d21743ecf7a44636121f85566f898e62ff61e97


[ROCm/clr commit: 07bcc283f9b71e184b51aa2b6e8e82bf32b351e4]
---
 projects/clr/rocclr/platform/commandqueue.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/clr/rocclr/platform/commandqueue.cpp b/projects/clr/rocclr/platform/commandqueue.cpp
index 310f41e74d..bc38121273 100644
--- a/projects/clr/rocclr/platform/commandqueue.cpp
+++ b/projects/clr/rocclr/platform/commandqueue.cpp
@@ -69,7 +69,6 @@ bool HostQueue::terminate() {
         // Note that if lastCommand isn't a marker, it may not be lastEnqueueCommand_ now
         // after lastCommand->awaitCompletion() is called.
         if (lastEnqueueCommand_ != nullptr) {
-          device_.removeFromActiveQueues(this);
           lastEnqueueCommand_ ->release(); // lastEnqueueCommand_ should be a marker
           lastEnqueueCommand_ = nullptr;
         }
@@ -119,6 +118,8 @@ bool HostQueue::terminate() {
     Agent::postCommandQueueFree(as_cl(this->asCommandQueue()));
   }
 
+  device_.removeFromActiveQueues(this);
+
   return true;
 }