From d44218ba55fe5e69afac8f28cdd4d9ff73f7ffb9 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 25 Aug 2024 15:53:35 +0200 Subject: [PATCH] Invalidate squadron livery if not found or incompatible --- qt_ui/widgets/combos/QSquadronLiverySelector.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qt_ui/widgets/combos/QSquadronLiverySelector.py b/qt_ui/widgets/combos/QSquadronLiverySelector.py index d278bf7e..85018275 100644 --- a/qt_ui/widgets/combos/QSquadronLiverySelector.py +++ b/qt_ui/widgets/combos/QSquadronLiverySelector.py @@ -39,6 +39,12 @@ class SquadronLiverySelector(QComboBox): for x in faction.liveries_overrides.get(self.aircraft_type, []) if x in [y.id.lower() for y in liveries] ] + if selected_livery and selected_livery.lower() not in [ + livery.id.lower() for livery in liveries + ]: + # squadron livery not found, or incompatible with faction + # => attempt to use the unit's default-livery as a fallback + selected_livery = None if squadron.livery_set: self.addItem(LIVERY_SET_TEXT, userData=None) if len(overrides) > 0: