From 565f8e2f97651735fa56eac9af6744a8b71bbd27 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 3 Jan 2018 13:07:21 +0000
Subject: [PATCH] Fix circular loop when adding debug messages in D3D12

---
 renderdoc/driver/d3d12/d3d12_device.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index 548bf02c7..4ab36cc7e 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -1747,19 +1747,18 @@ void WrappedID3D12Device::AddDebugMessage(MessageCategory c, MessageSeverity sv,
       msg.eventId = it->eventId;
     else
       RDCERR("Couldn't locate drawcall use for current chunk offset %llu", cmd.m_CurChunkOffset);
-  }
 
-  AddDebugMessage(msg);
+    AddDebugMessage(msg);
+  }
+  else
+  {
+    cmd.m_EventMessages.push_back(msg);
+  }
 }
 
 void WrappedID3D12Device::AddDebugMessage(const DebugMessage &msg)
 {
-  D3D12CommandData &cmd = *m_Queue->GetCommandData();
-
-  if(IsLoading(m_State))
-    cmd.m_EventMessages.push_back(msg);
-  else
-    m_DebugMessages.push_back(msg);
+  m_DebugMessages.push_back(msg);
 }
 
 std::vector<DebugMessage> WrappedID3D12Device::GetDebugMessages()