From 64b2eefacec8fde7e4dc0abee148bcba7e85af31 Mon Sep 17 00:00:00 2001 From: Simon Clark Date: Fri, 8 Jan 2021 10:22:56 +0000 Subject: [PATCH] Stop loadout resetting each time the editor opens. --- .../windows/mission/flight/payload/QLoadoutEditor.py | 11 +++++++---- qt_ui/windows/mission/flight/payload/QPylonEditor.py | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py index b84200e4..d53b1977 100644 --- a/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py +++ b/qt_ui/windows/mission/flight/payload/QLoadoutEditor.py @@ -37,9 +37,12 @@ class QLoadoutEditor(QGroupBox): hboxLayout.addStretch() self.setLayout(hboxLayout) + if not self.isChecked(): + for i in self.findChildren(QPylonEditor): + i.default_loadout(i.pylon.number) + def on_toggle(self): self.flight.use_custom_loadout = self.isChecked() - # When the toggle button is hit, reset the loadout to default. - # We need to do this regardless of whether we're toggling on or off. - for i in self.findChildren(QPylonEditor): - i.default_loadout(i.pylon.number) + if not self.isChecked(): + for i in self.findChildren(QPylonEditor): + i.default_loadout(i.pylon.number) diff --git a/qt_ui/windows/mission/flight/payload/QPylonEditor.py b/qt_ui/windows/mission/flight/payload/QPylonEditor.py index c869c380..0df7fcaf 100644 --- a/qt_ui/windows/mission/flight/payload/QPylonEditor.py +++ b/qt_ui/windows/mission/flight/payload/QPylonEditor.py @@ -29,8 +29,7 @@ class QPylonEditor(QComboBox): self.addItem(weapon.name, weapon) if current == weapon: self.setCurrentIndex(i + 1) - - self.default_loadout(self.pylon) + self.currentIndexChanged.connect(self.on_pylon_change) def on_pylon_change(self):