diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-20 21:58:30 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-21 00:52:07 +0200 |
| commit | 3b137ece1ab4bffe4c959047972c5d1317f8a79c (patch) | |
| tree | 3ed7f134b5754a75e66ed9ee0cfa1a7d6cefbe6f /src/lib/reel_writer.cc | |
| parent | e4b693f2e7b7dc2afb4e9ec3e96e317fff851c5b (diff) | |
Make digest calculations interruptible.
Diffstat (limited to 'src/lib/reel_writer.cc')
| -rw-r--r-- | src/lib/reel_writer.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index cd6a1a4b9..a3d499abe 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -745,6 +745,7 @@ ReelWriter::create_reel ( void ReelWriter::calculate_digests (boost::function<void (float)> set_progress) +try { if (_picture_asset) { _picture_asset->hash (set_progress); @@ -757,6 +758,10 @@ ReelWriter::calculate_digests (boost::function<void (float)> set_progress) if (_atmos_asset) { _atmos_asset->hash (set_progress); } +} catch (boost::thread_interrupted) { + /* set_progress contains an interruption_point, so any of these methods + * may throw thread_interrupted, at which point we just give up. + */ } Frame |