Merge pull request #6332 from stenzek/frame-dump-crash

Renderer: Fix crash on shutdown when frame dumping or taking screenshots
dolphin-emu · Jan 27, 2018 · c81ac1a · c81ac1a
2 parents 0eaf3de + 3f19748
commit c81ac1a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
@@ -800,6 +800,9 @@ void Renderer::ShutdownFrameDumping()
   m_frame_dump_start.Set();
   if (m_frame_dump_thread.joinable())
     m_frame_dump_thread.join();
+  m_frame_dump_render_texture.reset();
+  for (auto& tex : m_frame_dump_readback_textures)
+    tex.reset();
 }
 
 void Renderer::DumpFrameData(const u8* data, int w, int h, int stride, const AVIDump::Frame& state)