Merge remote-tracking branch 'origin/dev' into dev

JesseTG · Nov 30, 2024 · 8b13cbd · 8b13cbd
2 parents cf8c011 + 72d595c
commit 8b13cbd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/libretro/drivers/options/dict.py b/src/libretro/drivers/options/dict.py
@@ -72,12 +72,15 @@ def get_variable(self, item: bytes) -> bytes | None:
             value = self._variables[key]
         else:
             # Otherwise get the default value and save it to the dict
-            value = string_at(self._options_us[key].default_value)
+            value = self._options_us[key].default_value
+            value = string_at(value) if value is not None else None
             self._variables[key] = value
+            return value
 
         if value not in (string_at(v.value) for v in self._options_us[key].values if v.value):
             # For invalid values, return None
-            return string_at(self._options_us[key].default_value)
+            value = self._options_us[key].default_value
+            return string_at(value) if value is not None else None
 
         return self._variables[key]