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

Merge branch 'master' into test-3

Browse Source 
# Conflicts:
#	config.py
#	eos/effects/warpdisruptsphere.py
#	service/update.py
This commit is contained in:
blitzmann
2018-03-25 13:16:07 -04:00
parent 03212be54a 7c376c93a2
commit 3fd4d106d9
50 changed files with 242 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinAdditionPanes/cargoView.py
View File

@@ -135,7 +135,7 @@ class CargoView(d.Display):
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None: