From: Carl Hetherington <cth@carlh.net>
Date: Fri, 28 Sep 2018 00:22:25 +0000 (+0100)
Subject: Catch exception from file_size.
X-Git-Tag: v2.13.57^0
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=cee15a64c0a4dff457d6743fc07af014faddd09e

Catch exception from file_size.
---

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>();