weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes : Missing weapons names would cause flight edition window to crash while setting up default loadout UI, preventing the user from editing flights.

Browse Source
This commit is contained in:
Khopa 2021-02-26 23:30:23 +01:00
parent 60af2ad0a4
commit 58d5aa9944
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt_ui/windows/mission/flight/payload/QPylonEditor.py
View File

@ -64,6 +64,7 @@ class QPylonEditor(QComboBox):
if pylon_default_weapon is not None: if pylon_default_weapon is not None:
if self.game.settings.restrict_weapons_by_date: if self.game.settings.restrict_weapons_by_date:
orig_weapon = Weapon.from_clsid(pylon_default_weapon) orig_weapon = Weapon.from_clsid(pylon_default_weapon)
if orig_weapon is not None:
if not orig_weapon.available_on(self.game.date): if not orig_weapon.available_on(self.game.date):
for fallback in orig_weapon.fallbacks: for fallback in orig_weapon.fallbacks:
if historical_weapon is None: if historical_weapon is None:
@ -75,12 +76,14 @@ class QPylonEditor(QComboBox):
else: else:
historical_weapon = orig_weapon historical_weapon = orig_weapon
if historical_weapon is not None: if historical_weapon is not None:
self.setCurrentText( self.setCurrentText(historical_weapon.cls_id)
weapons_data.weapon_ids.get(historical_weapon.cls_id).get(
"name"
)
)
else: else:
self.setCurrentText(pylon_default_weapon)
else:
weapon = weapons_data.weapon_ids.get(pylon_default_weapon)
if weapon is not None:
self.setCurrentText( self.setCurrentText(
weapons_data.weapon_ids.get(pylon_default_weapon).get("name") weapons_data.weapon_ids.get(pylon_default_weapon).get("name")
) )
else:
self.setCurrentText(pylon_default_weapon)