From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 5 May 2021 12:10:27 +0000 (+0100)
Subject: shapelib: Report correct "for" name
X-Git-Tag: otter-0.6.0~377
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c7ef95e839dd0db9965a5cfa157c1d47dbfb7cb5;p=otter.git

shapelib: Report correct "for" name

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/shapelib.rs b/src/shapelib.rs
index 8e792fd6..c379b156 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -429,7 +429,7 @@ impl Contents {
         }
       },
       OccData::Internal(occ) => {
-        let name = occ.item_name.clone();
+        let occ_name = occ.item_name.clone();
         let svgd = {
           let mut svgd = occ.svgd.lock();
           let svgd = &mut *svgd;
@@ -437,7 +437,7 @@ impl Contents {
             Some(svgd) => svgd.clone(),
             None => {
               let occ_data = self.load_svg(occ.item_name.as_str(),
-                                           name.as_str())?;
+                                           name /* original */)?;
               let occ_data = Arc::new(occ_data);
               *svgd = Some(occ_data.clone());
               occ_data
@@ -451,7 +451,7 @@ impl Contents {
           desc: occ.desc.clone(),
           outline: occ.outline.clone(),
         }) as Arc<dyn OccultedPieceTrait>;
-        Some((OccultIlkName(name), it))
+        Some((OccultIlkName(occ_name), it))
       },
     };