ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Renderer: Fix crash on shutdown when frame dumping or taking screenshots
This commit is contained in:
Stenzek 2018-01-27 12:27:46 +10:00 committed by GitHub
parent 0eaf3deb1e 3f197480ef
commit c81ac1a81d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -800,6 +800,9 @@ void Renderer::ShutdownFrameDumping()
m_frame_dump_start.Set(); m_frame_dump_start.Set();
if (m_frame_dump_thread.joinable()) if (m_frame_dump_thread.joinable())
m_frame_dump_thread.join(); 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) void Renderer::DumpFrameData(const u8* data, int w, int h, int stride, const AVIDump::Frame& state)