From 88615eae8579becd37c501340053571b19bb92a7 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 3 Sep 2016 21:13:00 +0200 Subject: [PATCH] Graphics/DeferredRenderQueue: Fix crash on layer removal Former-commit-id: 42859917e1603acb297e0dec88d91ea673698bc7 [formerly 416ca6e56e3d19c57bbd22df7c0ee760bdc85449] [formerly b405620cd6b4ebe4413d13abd1082d68eb9d7203 [formerly 38b249271c7366e767111de1bb98bb63e0b86e93]] Former-commit-id: fb61d2d9bb16752c0e2ea9fbba3d8e61a138039d [formerly 5ef5905f3c64859d87425b76342acd6cc562ce5d] Former-commit-id: 36ab2a4d8a66737af06634dc2f79da1f9d6b5662 --- src/Nazara/Graphics/DeferredRenderQueue.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Nazara/Graphics/DeferredRenderQueue.cpp b/src/Nazara/Graphics/DeferredRenderQueue.cpp index 41fb9d20b..b240edcd7 100644 --- a/src/Nazara/Graphics/DeferredRenderQueue.cpp +++ b/src/Nazara/Graphics/DeferredRenderQueue.cpp @@ -273,7 +273,7 @@ namespace Nz layers.clear(); else { - for (auto it = layers.begin(); it != layers.end(); ++it) + for (auto it = layers.begin(); it != layers.end();) { Layer& layer = it->second; if (layer.clearCount++ >= 100) @@ -307,6 +307,8 @@ namespace Nz pipelineEntry.maxInstanceCount = 0; } } + + ++it; } } }