From: Carl Hetherington <cth@carlh.net>
Date: Tue, 2 Jul 2019 21:56:56 +0000 (+0100)
Subject: Don't crash if history items are inaccessible.
X-Git-Tag: v2.14.9~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d6ac233d9bdba4b42ad84fb7e312aad2a367ea77

Don't crash if history items are inaccessible.

Backported from 232ddcc9892a7dfd54efa7533c27c4cfdf71bffd in v2.15.x.
---

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 4ce4517f8..a4dea7fd1 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -1215,8 +1215,12 @@ Config::clean_history_internal (vector<boost::filesystem::path>& h)
 	vector<boost::filesystem::path> old = h;
 	h.clear ();
 	BOOST_FOREACH (boost::filesystem::path i, old) {
-		if (boost::filesystem::is_directory(i)) {
-			h.push_back (i);
+		try {
+			if (boost::filesystem::is_directory(i)) {
+				h.push_back (i);
+			}
+		} catch (...) {
+			/* We couldn't find out if it's a directory for some reason; just ignore it */
 		}
 	}
 }