From 059af217aaeed7126f20219ed896371afc397de1 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 8 Jan 2015 15:04:22 -0500 Subject: [PATCH] Fix #246 --- gui/patternEditor.py | 2 +- service/fit.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index f3b8da855c..7a5bceb012 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -125,7 +125,7 @@ def __init__(self, parent): editObj.Bind(wx.EVT_TEXT, self.ValuesUpdated) editObj.SetLimited(True) editObj.SetMin(0) - editObj.SetMax(99999) + editObj.SetMax(2000000) contentSizer.Add(dmgeditSizer, 1, wx.EXPAND | wx.ALL, 5) self.slfooter = wx.StaticLine(self) diff --git a/service/fit.py b/service/fit.py index 25635b0709..2da369576f 100644 --- a/service/fit.py +++ b/service/fit.py @@ -742,7 +742,7 @@ def setAsPattern(self, fitID, ammo): fit = eos.db.getFit(fitID) for attr in ("em", "thermal", "kinetic", "explosive"): - setattr(dp, "%sAmount" % attr, ammo.getAttribute("%sDamage" % attr)) + setattr(dp, "%sAmount" % attr, ammo.getAttribute("%sDamage" % attr) or 0) fit.damagePattern = dp self.recalc(fit)