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

Merge branch 'master' into release/1.36

Browse Source 
# Conflicts:
#	service/update.py
This commit is contained in:
blitzmann
2018-03-25 13:03:52 -04:00
parent 46098f2127 b7c45f4c6e
commit cccc7ff2d0
2 changed files with 4 additions and 2 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() sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID) 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 # Clear list and get out if current fitId is None
if event.fitID is None and self.lastFitId is not None: if event.fitID is None and self.lastFitId is not None:

4
service/update.py
View File

@@ -52,8 +52,8 @@ class CheckUpdateThread(threading.Thread):
key=lambda x: calendar.timegm(dateutil.parser.parse(x['published_at']).utctimetuple()), key=lambda x: calendar.timegm(dateutil.parser.parse(x['published_at']).utctimetuple()),
reverse=True reverse=True
) )
for release in jsonResponse[:5]: for release in jsonResponse[:5]:
# sometimes, depending on the tag name, things break. If they do, just continue to the next iteration
try: try:
# Suppress pre releases # Suppress pre releases
if release['prerelease'] and self.settings.get('prerelease'): if release['prerelease'] and self.settings.get('prerelease'):
@@ -90,6 +90,8 @@ class CheckUpdateThread(threading.Thread):
wx.CallAfter(self.callback, release) # Singularity -> Singularity wx.CallAfter(self.callback, release) # Singularity -> Singularity
break break
except Exception as e: except Exception as e:
# if we break at version checking, try the next version
pyfalog.error(e)
continue continue
except Exception as e: except Exception as e:
pyfalog.error("Caught exception in run") pyfalog.error("Caught exception in run")