dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Check if we have active drones when merging, if we do make them all active to avoid getting weird scenarios (like deactivating stacks, or only activating parts of stacks). Fixes #728

Browse Source
This commit is contained in:
Ebag333
2017-02-15 08:59:54 -08:00
parent 0dc3eda99f
commit 71ca7d153e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/droneView.py
View File

@@ -147,6 +147,12 @@ class DroneView(Display):
def _merge(self, src, dst):
sFit = Fit.getInstance()
fitID = self.mainFrame.getActiveFit()
# If either stack has active drones, make them all active. Fixes #728
if (getattr(self.drones[src], "amountActive", 0) + getattr(self.drones[dst], "amountActive", 0)) > 0:
self.drones[src].amountActive = getattr(self.drones[src], "amount", 0)
self.drones[dst].amountActive = getattr(self.drones[dst], "amount", 0)
if sFit.mergeDrones(fitID, self.drones[src], self.drones[dst]):
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))