From 116f4c831d7e83eb3e6b4b5267f6857218dd2965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Thu, 25 Jul 2019 20:29:30 +0200 Subject: [PATCH] Put fix in correct position This fixes a mismerge by @elmindreda in 65748fb8f316384cda39583a489c39ae80124305. (cherry picked from commit efda4afb495be4779c152a96f7b3f52c54cbff32) --- tests/triangle-vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/triangle-vulkan.c b/tests/triangle-vulkan.c index 8600ced7..33442968 100644 --- a/tests/triangle-vulkan.c +++ b/tests/triangle-vulkan.c @@ -2118,7 +2118,6 @@ static void demo_cleanup(struct demo *demo) { if (demo->setup_cmd) { vkFreeCommandBuffers(demo->device, demo->cmd_pool, 1, &demo->setup_cmd); - demo->setup_cmd = VK_NULL_HANDLE; } vkFreeCommandBuffers(demo->device, demo->cmd_pool, 1, &demo->draw_cmd); vkDestroyCommandPool(demo->device, demo->cmd_pool, NULL); @@ -2178,6 +2177,7 @@ static void demo_resize(struct demo *demo) { if (demo->setup_cmd) { vkFreeCommandBuffers(demo->device, demo->cmd_pool, 1, &demo->setup_cmd); + demo->setup_cmd = VK_NULL_HANDLE; } vkFreeCommandBuffers(demo->device, demo->cmd_pool, 1, &demo->draw_cmd); vkDestroyCommandPool(demo->device, demo->cmd_pool, NULL);