From 8702374bf778fd58e1df3efee041c95dd7ef6466 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 1 Apr 2019 02:58:02 +0200 Subject: [PATCH] [dxvk] Do not invalidate iterator before disabling queries Reported-by: Joshua Ashton --- src/dxvk/dxvk_gpu_query.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dxvk/dxvk_gpu_query.cpp b/src/dxvk/dxvk_gpu_query.cpp index 9f0b2938..8fdd428b 100644 --- a/src/dxvk/dxvk_gpu_query.cpp +++ b/src/dxvk/dxvk_gpu_query.cpp @@ -320,10 +320,9 @@ namespace dxvk { query); if (iter != m_activeQueries.end()) { - m_activeQueries.erase(iter); - if (m_activeTypes & getQueryTypeBit((*iter)->type())) endSingleQuery(cmd, query); + m_activeQueries.erase(iter); query->end(); }