chiark / gitweb /
shapelib: Show things better when they are occulted
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 22 Mar 2021 01:35:37 +0000 (01:35 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 22 Mar 2021 01:37:00 +0000 (01:37 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/shapelib.rs

index e204135792b2cc7d8b886263e8530b89eb7cb34c..242558b72d1641c51478240c4ec32638d9cd5a09 100644 (file)
@@ -257,13 +257,10 @@ impl Item {
 
   #[throws(IE)]
   fn describe_face(&self, face: FaceId) -> Html {
-    if let Some(face) = self.faces.get(face) {
-      self.descs[ face.desc ].clone()
-    } else if let Some(back) = &self.back {
-      back.describe_html()?
-    } else {
-      throw!(internal_error_bydebug(&(self, face)))
-    }
+    // When we are not occulted, we can show are true identity
+    // even if we have a back.
+    let face = self.faces.get(face).unwrap_or(&self.faces[0]);
+    self.descs[ face.desc ].clone()
   }
 }