Hand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from master.

diff --git a/ChangeLog b/ChangeLog
index ba9012f0fd59756cf0def5437af6cfe7735e2b98..66c0a64e1685dc71a28d6fd14f2c7b8bfbcc61e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
 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.
 
        * 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 e9b57e2e13da1ba9f60fde4b458e37f0feeb28f3..6edd154e04030ea1142ccdbff86e107a98261d79 100644 (file)
--- a/src/lib/ratio.cc
+++ b/src/lib/ratio.cc
@@ -45,6 +45,11 @@ Ratio::setup_ratios ()
 Ratio const *
 Ratio::from_id (string i)
 {
 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;
        vector<Ratio const *>::iterator j = _ratios.begin ();
        while (j != _ratios.end() && (*j)->id() != i) {
                ++j;