From 66a26ddf9f0d813038f0f0529efd2ab9690d5179 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Tue, 15 Mar 2016 09:49:03 -0600
Subject: layers: Fix crash in core_validation layer

CommandBuffers were getting added to commandPoolMap twice.

Change-Id: I115757751ef0aebb1f2599217b3117beca3cd0b7
---
 layers/core_validation.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index fbc8607f..f19a5b71 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -6816,7 +6816,9 @@ vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pCr
             // Validate command pool
             if (dev_data->commandPoolMap.find(pCreateInfo->commandPool) != dev_data->commandPoolMap.end()) {
                 // Add command buffer to its commandPool map
+#if !MTMERGE
                 dev_data->commandPoolMap[pCreateInfo->commandPool].commandBuffers.push_back(pCommandBuffer[i]);
+#endif
                 GLOBAL_CB_NODE *pCB = new GLOBAL_CB_NODE;
                 // Add command buffer to map
                 dev_data->commandBufferMap[pCommandBuffer[i]] = pCB;
-- 
cgit v1.2.3