Merge branch 'master' into development

Conflicts:
	config.py

config.py

@@ -19,7 +19,7 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.29.4"
+version = "1.29.5"
 tag = "git"
 expansionName = "YC119.5"
 expansionVersion = "1.0"

eos/db/saveddata/queries.py

@@ -17,6 +17,8 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
+import sys
+
 from sqlalchemy.sql import and_
 from sqlalchemy import desc, select
 
@@ -539,5 +541,10 @@ def remove(stuff):
 
 def commit():
     with sd_lock:
-        saveddata_session.commit()
-        saveddata_session.flush()
+        try:
+            saveddata_session.commit()
+            saveddata_session.flush()
+        except Exception:
+            saveddata_session.rollback()
+            exc_info = sys.exc_info()
+            raise exc_info[0], exc_info[1], exc_info[2]

gui/characterEditor.py

@@ -297,6 +297,9 @@ class SkillTreeView(wx.Panel):
 
         self.clonesChoice.Bind(wx.EVT_CHOICE, self.cloneChanged)
 
+        self.clonesChoice.SetToolTip(
+            wx.ToolTip("Setting an Alpha clone does not replace the character's skills, but rather caps them to Alpha levels."))
+
         pmainSizer.Add(hSizer, 0, wx.EXPAND | wx.ALL, 5)
 
         # Set up timer for skill search

gui/crestFittings.py

@@ -407,7 +407,13 @@ class FittingsTreeView(wx.Panel):
 
     def displayFit(self, event):
         selection = self.fittingsTreeCtrl.GetSelection()
-        fit = json.loads(self.fittingsTreeCtrl.GetPyData(selection))
+        data = self.fittingsTreeCtrl.GetPyData(selection)
+
+        if data is None:
+            event.Skip()
+            return
+
+        fit = json.loads(data)
         list = []
 
         for item in fit['items']:

service/fit.py

@@ -185,7 +185,7 @@ class Fit(object):
             if booster.boosted_fit != fit and booster.boosted_fit in eos.db.saveddata_session:  # GH issue #359
                 refreshFits.add(booster.boosted_fit)
 
-        eos.db.saveddata_session.delete(fit)
+        eos.db.remove(fit)
 
         pyfalog.debug("    Need to refresh {} fits: {}", len(refreshFits), refreshFits)
         for fit in refreshFits: