diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-26 16:41:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-26 16:41:06 +0100 |
| commit | 520203da69da7b6638cba569ca1975a7dd036b5e (patch) | |
| tree | 0c8682ab82055f9605ad22fe01fe42aa8b751d99 /src | |
| parent | 9d92cbeac32b8b22c9d79b936ac583d60fda5725 (diff) | |
Fix up another deadlock. Tidy tests slightly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 81de2b518..9c351a64d 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -607,6 +607,7 @@ Film::thumb_file_for_frame (int n) const return thumb_base_for_frame(n) + ".png"; } +/** Must not be called with the _state_mutex locked */ string Film::thumb_base (int n) const { @@ -616,8 +617,6 @@ Film::thumb_base (int n) const string Film::thumb_base_for_frame (int n) const { - boost::mutex::scoped_lock lm (_state_mutex); - stringstream s; s.width (8); s << setfill('0') << n; @@ -631,6 +630,8 @@ Film::thumb_base_for_frame (int n) const /** @param n A thumb index. * @return The frame within the Film that it is for. + * + * Must not be called with the _state_mutex locked. */ int Film::thumb_frame (int n) const |