From 8192bd961354db34addfeec8ec8af2c386b8534c Mon Sep 17 00:00:00 2001
From: Twan van Laarhoven <twanvl@gmail.com>
Date: Fri, 22 May 2020 16:17:33 +0200
Subject: [PATCH] fix: don't use cannonical name form when generating choice
 images, use it only for indexing

---
 src/gui/value/choice.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index 561515ba..f709b395 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -150,10 +150,10 @@ void DropDownChoiceListBase::generateThumbnailImages() {
     int n = field().choices->lastId();
     for (int i = 0 ; i < n; ++i) {
       try {
-        String name = canonical_name_form(field().choices->choiceName(i));
+        String name = field().choices->choiceName(i);
         ctx.setVariable(_("input"), to_script(name));
         GeneratedImageP img = style().image.getValidScriptP()->eval(ctx)->toImage();
-        style().choice_images.insert(make_pair(name, ScriptableImage(img)));
+        style().choice_images.try_emplace(canonical_name_form(name), ScriptableImage(img));
       } catch (const Error& e) {
         handle_error(Error(e.what() + _("\n  while generating choice images for drop down list")));
       }