Merge pull request #8517 from gadfort/gui-conf-load

maliberty · web-flow · commit f31d72777c60 · 2025-10-02T00:45:50.000Z
gui: ensure renderer settings can load after data type changes
diff --git a/src/gui/include/gui/gui.h b/src/gui/include/gui/gui.h
@@ -545,7 +545,11 @@ class Renderer
                          T& value)
   {
     if (settings.count(key) == 1) {
-      value = std::get<T>(settings.at(key));
+      try {
+        value = std::get<T>(settings.at(key));
+      } catch (const std::bad_variant_access&) {
+        // Stay with current value
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,11 @@ class Renderer`
`545`	`545`	`T& value)`
`546`	`546`	`{`
`547`	`547`	`if (settings.count(key) == 1) {`
`548`		`- value = std::get<T>(settings.at(key));`
	`548`	`+ try {`
	`549`	`+ value = std::get<T>(settings.at(key));`
	`550`	`+ } catch (const std::bad_variant_access&) {`
	`551`	`+ // Stay with current value`
	`552`	`+ }`
`549`	`553`	`}`
`550`	`554`	`}`
`551`	`555`