diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-04 22:30:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-04 22:30:16 +0100 |
| commit | 29c0f7573ddab036f6219c88333a3404db736fd3 (patch) | |
| tree | 88319680b6c950de247f5610d2594eb1a23b0ff1 /src/lib | |
| parent | b299bc81a265d1934bab2c4bce2c8aa48452bbb0 (diff) | |
Fix deadlock.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 440b10a19..19f38c5f6 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -123,9 +123,11 @@ DCPSubtitleContent::set_subtitle_video_frame_rate (int r) double DCPSubtitleContent::subtitle_video_frame_rate () const { - boost::mutex::scoped_lock lm (_mutex); - if (_frame_rate) { - return _frame_rate.get (); + { + boost::mutex::scoped_lock lm (_mutex); + if (_frame_rate) { + return _frame_rate.get (); + } } /* No frame rate specified, so assume this content has been |