From 627444bea89cbe9778ac344b282b4a9bcc49f24c 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: 36ccd0e1d5b19b5b6fb47d485ef10e6f05a74bbb [formerly e1d228504afce70f6e73ccc2b825e2b048b03c5c] [formerly e2f9b47540640faa330e43fe1cf721d0ae66d170 [formerly 2efd87e99322061c14546ef0905d83e41de93b9b]] Former-commit-id: 572862971c69fe3e9d860df7edea12532534b597 [formerly 6e2f6c67b1cd1d40d9a183b66173093d55e09b1d] Former-commit-id: 21bff695f015134fb86ddb1a0b8a444223392df4 --- 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; } } }