From cd567260403f397d35d292f115415e7108d0cf90 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 9 Jun 2017 20:08:39 +0100
Subject: [PATCH] Only wrap DXGI outputs if one is returned (some functions
 return NULL)

---
 renderdoc/driver/dxgi/dxgi_wrapped.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/dxgi/dxgi_wrapped.cpp b/renderdoc/driver/dxgi/dxgi_wrapped.cpp
index 6e942e22c..fe233d1c0 100644
--- a/renderdoc/driver/dxgi/dxgi_wrapped.cpp
+++ b/renderdoc/driver/dxgi/dxgi_wrapped.cpp
@@ -359,7 +359,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::GetContainingOutput(IDXGIOutpu
 {
   HRESULT ret = m_pReal->GetContainingOutput(ppOutput);
 
-  if(SUCCEEDED(ret))
+  if(SUCCEEDED(ret) && *ppOutput)
     *ppOutput = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppOutput));
 
   return ret;
@@ -408,7 +408,7 @@ HRESULT WrappedIDXGISwapChain4::GetFullscreenState(
 {
   HRESULT ret = m_pReal->GetFullscreenState(pFullscreen, ppTarget);
 
-  if(SUCCEEDED(ret))
+  if(SUCCEEDED(ret) && *ppTarget)
     *ppTarget = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppTarget));
 
   return ret;
@@ -554,7 +554,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDXGISwapChain4::GetRestrictToOutput(IDXGIOutpu
 {
   HRESULT ret = m_pReal2->GetRestrictToOutput(ppRestrictToOutput);
 
-  if(SUCCEEDED(ret))
+  if(SUCCEEDED(ret) && *ppRestrictToOutput)
     *ppRestrictToOutput = (IDXGIOutput *)(new WrappedIDXGIOutput5(this, *ppRestrictToOutput));
 
   return ret;