Merge pull request #5127 from FearlessTobi/port-5617
Port citra-emu/citra#5617: "Fix telemetry-related exit crash from use-after-free"
This commit is contained in:
commit
63419e144f
|
@ -275,9 +275,9 @@ void RendererOpenGL::AddTelemetryFields() {
|
||||||
LOG_INFO(Render_OpenGL, "GL_RENDERER: {}", gpu_model);
|
LOG_INFO(Render_OpenGL, "GL_RENDERER: {}", gpu_model);
|
||||||
|
|
||||||
constexpr auto user_system = Common::Telemetry::FieldType::UserSystem;
|
constexpr auto user_system = Common::Telemetry::FieldType::UserSystem;
|
||||||
telemetry_session.AddField(user_system, "GPU_Vendor", gpu_vendor);
|
telemetry_session.AddField(user_system, "GPU_Vendor", std::string(gpu_vendor));
|
||||||
telemetry_session.AddField(user_system, "GPU_Model", gpu_model);
|
telemetry_session.AddField(user_system, "GPU_Model", std::string(gpu_model));
|
||||||
telemetry_session.AddField(user_system, "GPU_OpenGL_Version", gl_version);
|
telemetry_session.AddField(user_system, "GPU_OpenGL_Version", std::string(gl_version));
|
||||||
}
|
}
|
||||||
|
|
||||||
void RendererOpenGL::CreateRasterizer() {
|
void RendererOpenGL::CreateRasterizer() {
|
||||||
|
|
Reference in New Issue