From b14c8927403b98ef9037fa62415dcbdc3b3cc492 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 10 May 2017 21:29:39 -0400 Subject: [PATCH] Switched to a safer RAII approach to this lock. --- Outputs/CRT/Internals/CRTOpenGL.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Outputs/CRT/Internals/CRTOpenGL.cpp b/Outputs/CRT/Internals/CRTOpenGL.cpp index 28ec3d0e3..0b5c3f275 100644 --- a/Outputs/CRT/Internals/CRTOpenGL.cpp +++ b/Outputs/CRT/Internals/CRTOpenGL.cpp @@ -336,7 +336,7 @@ void OpenGLOutputBuilder::set_output_device(OutputDevice output_device) { } void OpenGLOutputBuilder::set_timing(unsigned int input_frequency, unsigned int cycles_per_line, unsigned int height_of_display, unsigned int horizontal_scan_period, unsigned int vertical_scan_period, unsigned int vertical_period_divider) { - output_mutex_.lock(); + std::lock_guard lock_guard(output_mutex_); input_frequency_ = input_frequency; cycles_per_line_ = cycles_per_line; height_of_display_ = height_of_display; @@ -345,7 +345,6 @@ void OpenGLOutputBuilder::set_timing(unsigned int input_frequency, unsigned int vertical_period_divider_ = vertical_period_divider; set_timing_uniforms(); - output_mutex_.unlock(); } #pragma mark - Internal Configuration