From b14d7c2c0b9140eb50aeb7deebc520c3aed44b92 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 21 Oct 2016 18:51:58 +0200
Subject: [PATCH] return NULL for heaps that aren't in the capture

---
 renderdoc/driver/d3d12/d3d12_manager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/renderdoc/driver/d3d12/d3d12_manager.cpp b/renderdoc/driver/d3d12/d3d12_manager.cpp
index d35e69851..44d3264fc 100644
--- a/renderdoc/driver/d3d12/d3d12_manager.cpp
+++ b/renderdoc/driver/d3d12/d3d12_manager.cpp
@@ -347,6 +347,9 @@ D3D12Descriptor *DescriptorFromPortableHandle(D3D12ResourceManager *manager, Por
   if(handle.heap == ResourceId())
     return NULL;
 
+  if(!manager->HasLiveResource(handle.heap))
+    return NULL;
+
   WrappedID3D12DescriptorHeap *heap = manager->GetLiveAs<WrappedID3D12DescriptorHeap>(handle.heap);
 
   if(heap)