From 3964658d9a55c98f1372ad6f001d8a67e1b0c7d7 Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Sun, 25 Mar 2018 03:18:34 -0400
Subject: [PATCH 1/2] Enable cargohold for structures (#1414)

---
 gui/builtinAdditionPanes/cargoView.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py
index 742ff11b1..cb6a5b47e 100644
--- a/gui/builtinAdditionPanes/cargoView.py
+++ b/gui/builtinAdditionPanes/cargoView.py
@@ -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:

From b7c45f4c6e6b80d90fababd168f3d4f4db39768f Mon Sep 17 00:00:00 2001
From: blitzmann <holmes.ryan.90@gmail.com>
Date: Sun, 25 Mar 2018 03:33:02 -0400
Subject: [PATCH 2/2] Fix the update check logic; only go through the 5 latests
 updates, and if the check fails (specifically due to our new beta tagging for
 v2) then simply continue to the next one instead of failing outright

---
 service/update.py | 64 ++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/service/update.py b/service/update.py
index 7196b2a59..505bcb30d 100644
--- a/service/update.py
+++ b/service/update.py
@@ -53,38 +53,46 @@ class CheckUpdateThread(threading.Thread):
                 reverse=True
             )
 
-            for release in jsonResponse:
-                # Suppress pre releases
-                if release['prerelease'] and self.settings.get('prerelease'):
-                    continue
+            for release in jsonResponse[:5]:
+                try:
+                    # Suppress pre releases
+                    if release['prerelease'] and self.settings.get('prerelease'):
+                        continue
 
-                # Handle use-case of updating to suppressed version
-                if self.settings.get('version') == 'v' + config.version:
-                    self.settings.set('version', None)
+                    # Handle use-case of updating to suppressed version
+                    if self.settings.get('version') == 'v' + config.version:
+                        self.settings.set('version', None)
 
-                # Suppress version
-                if release['tag_name'] == self.settings.get('version'):
-                    break
+                    # Suppress version
+                    if release['tag_name'] == self.settings.get('version'):
+                        break
 
-                # Set the release version that we will be comparing with.
-                if release['prerelease']:
-                    rVersion = release['tag_name'].replace('singularity-', '', 1)
-                else:
-                    rVersion = release['tag_name'].replace('v', '', 1)
-
-                if config.tag is 'git' and \
-                        not release['prerelease'] and \
-                        self.versiontuple(rVersion) >= self.versiontuple(config.version):
-                    wx.CallAfter(self.callback, release)  # git (dev/Singularity) -> Stable
-                elif config.expansionName is not "Singularity":
+                    # Set the release version that we will be comparing with.
                     if release['prerelease']:
-                        wx.CallAfter(self.callback, release)  # Stable -> Singularity
-                    elif self.versiontuple(rVersion) > self.versiontuple(config.version):
-                        wx.CallAfter(self.callback, release)  # Stable -> Stable
-                else:
-                    if release['prerelease'] and rVersion > config.expansionVersion:
-                        wx.CallAfter(self.callback, release)  # Singularity -> Singularity
-                break
+                        rVersion = release['tag_name'].replace('singularity-', '', 1)
+                    else:
+                        rVersion = release['tag_name'].replace('v', '', 1)
+
+                    if config.tag is 'git' and \
+                            not release['prerelease'] and \
+                            self.versiontuple(rVersion) >= self.versiontuple(config.version):
+                        wx.CallAfter(self.callback, release)  # git (dev/Singularity) -> Stable
+                        break
+                    elif config.expansionName is not "Singularity":
+                        if release['prerelease']:
+                            wx.CallAfter(self.callback, release)  # Stable -> Singularity
+                            break
+                        elif self.versiontuple(rVersion) > self.versiontuple(config.version):
+                            wx.CallAfter(self.callback, release)  # Stable -> Stable
+                            break
+                    else:
+                        if release['prerelease'] and rVersion > config.expansionVersion:
+                            wx.CallAfter(self.callback, release)  # Singularity -> Singularity
+                            break
+                except Exception as e:
+                    # if we break at version checking, try the next version
+                    pyfalog.error(e)
+                    continue
         except Exception as e:
             pyfalog.error("Caught exception in run")
             pyfalog.error(e)