summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-28 01:22:25 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-28 01:22:25 +0100
commitcee15a64c0a4dff457d6743fc07af014faddd09e (patch)
tree8b72d1c9e164ab7a7e8ca6e985270627435dd25a
parent73461f719bfb3ee91644b84f4bffd91df0e6559f (diff)
Catch exception from file_size.v2.13.57
-rw-r--r--src/tools/dcpomatic_player.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 3eec00e51..1742f6540 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -334,15 +334,15 @@ public:
return optional<dcp::EncryptedKDM>();
}
for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
- if (file_size(i->path()) < MAX_KDM_SIZE) {
- try {
+ try {
+ if (file_size(i->path()) < MAX_KDM_SIZE) {
dcp::EncryptedKDM kdm (dcp::file_to_string(i->path()));
if (kdm.cpl_id() == dcp->cpl()) {
return kdm;
}
- } catch (std::exception& e) {
- /* Hey well */
}
+ } catch (std::exception& e) {
+ /* Hey well */
}
}
return optional<dcp::EncryptedKDM>();