From b173e85a1f356294f8a72426876ad79f448db61b Mon Sep 17 00:00:00 2001
From: Aurelien Chanot <aurelien.chanot@oppo.com>
Date: Fri, 15 Apr 2022 12:23:28 -0700
Subject: [PATCH] Fix crash when application is using unsupported function.

It fixes this crash:
https://gist.github.com/achanot/7e0d25d1e5a619a61b688ec895c7a349
---
 renderdoc/driver/gl/gl_driver.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index 564ec2be8..91459eef0 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -1011,8 +1011,12 @@ void WrappedOpenGL::UseUnusedSupportedFunction(const char *name)
       if(it->second.Modern())
       {
         RenderDoc::Inst().RemoveDeviceFrameCapturer(it->second.ctx);
-        for(auto wnd : it->second.windows)
-          it->second.UnassociateWindow(this, wnd.first);
+        for(auto wnd = it->second.windows.begin(); wnd != it->second.windows.end();)
+        {
+          void *wndHandle = wnd->first;
+          wnd++;
+          it->second.UnassociateWindow(this, wndHandle);
+        }
       }
     }
   }