From: Carl Hetherington <cth@carlh.net>
Date: Sun, 12 Apr 2015 16:35:02 +0000 (+0100)
Subject: Hand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from master.
X-Git-Tag: v2.0.48~164
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=86346ad4f67810e1dadad5d22fbc676b02c7faa7

Hand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from 
---

diff --git a/ChangeLog b/ChangeLog
index ba9012f0f..66c0a64e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
+	* Hand-apply 69866d9ba972d21375081c313ac245535ac55be9 from master;
+	handle removed ratio if it occurs in old files.
+
 	* Hand-apply c0e0b90d987af2586323d4a67bd67330256da51d from master;
 	remove 1.37 ratio and set Academy to 1.375.
 
diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
index e9b57e2e1..6edd154e0 100644
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -45,6 +45,11 @@ Ratio::setup_ratios ()
 Ratio const *
 Ratio::from_id (string i)
 {
+	/* We removed the ratio with id 137; replace it with 138 */
+	if (i == "137") {
+		i = "138";
+	}
+	
 	vector<Ratio const *>::iterator j = _ratios.begin ();
 	while (j != _ratios.end() && (*j)->id() != i) {
 		++j;