diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-04 21:57:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 21:57:40 -0800 |
| commit | 63419e144ffeeb30220bacd6307360c76b4363f1 (patch) | |
| tree | 0fce66ef5677dbbe6ad97d043ac7d23f219f3144 /src | |
| parent | 2a928d7492905c9c4dcc31ce41d2121d8fb60c85 (diff) | |
| parent | 37d672bf08c810e48dd48a08fc33ec28a6c8a6cf (diff) | |
Merge pull request #5127 from FearlessTobi/port-5617
Port citra-emu/citra#5617: "Fix telemetry-related exit crash from use-after-free"
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index c869bb0e2..1523cd6fa 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -275,9 +275,9 @@ void RendererOpenGL::AddTelemetryFields() { LOG_INFO(Render_OpenGL, "GL_RENDERER: {}", gpu_model); constexpr auto user_system = Common::Telemetry::FieldType::UserSystem; - telemetry_session.AddField(user_system, "GPU_Vendor", gpu_vendor); - telemetry_session.AddField(user_system, "GPU_Model", gpu_model); - telemetry_session.AddField(user_system, "GPU_OpenGL_Version", gl_version); + telemetry_session.AddField(user_system, "GPU_Vendor", std::string(gpu_vendor)); + telemetry_session.AddField(user_system, "GPU_Model", std::string(gpu_model)); + telemetry_session.AddField(user_system, "GPU_OpenGL_Version", std::string(gl_version)); } void RendererOpenGL::CreateRasterizer() { |