Merge branch 'master' into singularity

gui/builtinContextMenus/graphDmgApplyProjected.py

@@ -17,7 +17,7 @@ class GraphDmgApplyProjectedMenu(ContextMenuUnconditional):
         return srcContext == 'dmgStatsGraph'
 
     def getText(self, callingWindow, itmContext):
-        return 'Apply Attacker Webs and TPs'
+        return 'Apply Projected Items'
 
     def activate(self, callingWindow, fullContext, i):
         self.settings.set('applyProjected', not self.settings.get('applyProjected'))

gui/esiFittings.py

@@ -273,7 +273,15 @@ class ExportToEve(AuxiliaryFrame):
         sEsi = Esi.getInstance()
 
         sFit = Fit.getInstance()
-        data = sPort.exportESI(sFit.getFit(fitID))
+        try:
+            data = sPort.exportESI(sFit.getFit(fitID))
+        except ESIExportException as e:
+            msg = str(e)
+            if not msg:
+                msg = "Failed to generate export data"
+            pyfalog.warning(msg)
+            self.statusbar.SetStatusText(msg, 1)
+            return
         activeChar = self.getActiveCharacter()
         if activeChar is None:
             msg = "Need at least one ESI character to export"