From 475a526ee5bf038c39579aa2b3c7e65dcbf84042 Mon Sep 17 00:00:00 2001 From: Michael Rennie Date: Wed, 12 Oct 2016 12:38:55 +0100 Subject: [PATCH] Check for NULL serialiser in D3D wrappedDev. --- renderdoc/driver/d3d11/d3d11_replay.cpp | 2 +- renderdoc/driver/d3d12/d3d12_replay.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp index 7cfb9e476..aa5e64864 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.cpp +++ b/renderdoc/driver/d3d11/d3d11_replay.cpp @@ -2066,7 +2066,7 @@ ReplayCreateStatus D3D11_CreateReplayDevice(const char *logfile, IReplayDriver * wrappedDev->SetLogFile(logfile); wrappedDev->SetLogVersion(initParams.SerialiseVersion); - if(wrappedDev->GetSerialiser()->HasError()) + if(logfile && wrappedDev->GetSerialiser()->HasError()) { SAFE_RELEASE(wrappedDev); return eReplayCreate_FileIOFailed; diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp index 7022f7e1b..4a97b107a 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.cpp +++ b/renderdoc/driver/d3d12/d3d12_replay.cpp @@ -1538,7 +1538,7 @@ ReplayCreateStatus D3D12_CreateReplayDevice(const char *logfile, IReplayDriver * wrappedDev->SetLogFile(logfile); wrappedDev->SetLogVersion(initParams.SerialiseVersion); - if(wrappedDev->GetSerialiser()->HasError()) + if(logfile && wrappedDev->GetSerialiser()->HasError()) { SAFE_RELEASE(wrappedDev); return eReplayCreate_FileIOFailed;