From 675a629ae5479094f9c32cdee4fde97a3aca4f36 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sun, 18 Feb 2018 23:39:55 +0100
Subject: [PATCH] [d3d11] Fixed crash with timestamp disjoint queries

---
 src/d3d11/d3d11_query.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/d3d11/d3d11_query.cpp b/src/d3d11/d3d11_query.cpp
index 3970d7b4f..90914a517 100644
--- a/src/d3d11/d3d11_query.cpp
+++ b/src/d3d11/d3d11_query.cpp
@@ -169,7 +169,8 @@ namespace dxvk {
     } else {
       DxvkQueryData queryData = {};
       
-      if (m_query->getData(queryData) != DxvkQueryStatus::Available)
+      if (m_query                     != nullptr
+       && m_query->getData(queryData) != DxvkQueryStatus::Available)
         return S_FALSE;
       
       if (pData == nullptr)
@@ -189,6 +190,7 @@ namespace dxvk {
           return S_OK;
         
         case D3D11_QUERY_TIMESTAMP_DISJOINT: {
+          // FIXME return correct frequency
           auto data = static_cast<D3D11_QUERY_DATA_TIMESTAMP_DISJOINT*>(pData);
           data->Frequency = 1000;
           data->Disjoint = FALSE;