From 0527a506ac73ab7e013326df878bdc1ecf524901 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Mon, 3 Jul 2017 01:46:46 -0400
Subject: [PATCH] fix broken events preventing additions panels to not work

---
 eos/gamedata.py                           | 2 +-
 eos/saveddata/drone.py                    | 2 +-
 gui/builtinAdditionPanes/commandView.py   | 5 ++++-
 gui/builtinAdditionPanes/droneView.py     | 3 +++
 gui/builtinAdditionPanes/fighterView.py   | 2 ++
 gui/builtinAdditionPanes/implantView.py   | 2 ++
 gui/builtinAdditionPanes/notesView.py     | 2 ++
 gui/builtinAdditionPanes/projectedView.py | 2 ++
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/eos/gamedata.py b/eos/gamedata.py
index 051ad6164..03d64957c 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -68,7 +68,7 @@ class Effect(EqBase):
         if not self.__generated:
             self.__generateHandler()
 
-        pyfalog.debug("Generating effect: {0} ({1}) [runTime: {2}]", self.name, self.effectID, self.runTime)
+        #pyfalog.debug("Generating effect: {0} ({1}) [runTime: {2}]", self.name, self.effectID, self.runTime)
 
         return self.__handler
 
diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py
index d5ef1c37a..28012f64f 100644
--- a/eos/saveddata/drone.py
+++ b/eos/saveddata/drone.py
@@ -102,7 +102,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 
     @property
     def cycleTime(self):
-        return max(self.getModifiedItemAttr("duration"), 0)
+        return max(self.getModifiedItemAttr("duration", 0), 0)
 
     @property
     def dealsDamage(self):
diff --git a/gui/builtinAdditionPanes/commandView.py b/gui/builtinAdditionPanes/commandView.py
index 697953995..a02dd70f4 100644
--- a/gui/builtinAdditionPanes/commandView.py
+++ b/gui/builtinAdditionPanes/commandView.py
@@ -66,7 +66,6 @@ class CommandView(d.Display):
 
         self.lastFitId = None
 
-        self.mainFrame.Bind(GE.FIT_CHANGED, CommandFits.populateFits)
         self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
         self.Bind(wx.EVT_LEFT_DOWN, self.click)
         self.Bind(wx.EVT_RIGHT_DOWN, self.click)
@@ -134,6 +133,8 @@ class CommandView(d.Display):
         sFit = Fit.getInstance()
         fit = sFit.getFit(event.fitID)
 
+        CommandFits.populateFits(event)
+
         self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
 
         # Clear list and get out if current fitId is None
@@ -165,6 +166,8 @@ class CommandView(d.Display):
 
         self.update(stuff)
 
+        event.Skip()
+
     def get(self, row):
         numFits = len(self.fits)
 
diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py
index 2fd15a1e7..41327618b 100644
--- a/gui/builtinAdditionPanes/droneView.py
+++ b/gui/builtinAdditionPanes/droneView.py
@@ -21,6 +21,7 @@
 import wx
 
 import gui.globalEvents as GE
+import gui.mainFrame
 from gui.builtinMarketBrowser.events import ItemSelected, ITEM_SELECTED
 from gui.display import Display
 from gui.builtinViewColumns.state import State
@@ -66,6 +67,8 @@ class DroneView(Display):
         self.hoveredRow = None
         self.hoveredColumn = None
 
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
         self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
         self.mainFrame.Bind(ITEM_SELECTED, self.addItem)
         self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py
index 4291e421d..e68b56820 100644
--- a/gui/builtinAdditionPanes/fighterView.py
+++ b/gui/builtinAdditionPanes/fighterView.py
@@ -108,6 +108,8 @@ class FighterView(wx.Panel):
 
             self.Refresh()
 
+        event.Skip()
+
 
 class FighterDisplay(d.Display):
     DEFAULT_COLS = ["State",
diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py
index e779f5672..24acf313b 100644
--- a/gui/builtinAdditionPanes/implantView.py
+++ b/gui/builtinAdditionPanes/implantView.py
@@ -71,6 +71,8 @@ class ImplantView(wx.Panel):
         self.rbFit.Enable(fit is not None)
         self.rbChar.Enable(fit is not None)
 
+        event.Skip()
+
     def OnRadioSelect(self, event):
         fitID = self.mainFrame.getActiveFit()
         sFit = Fit.getInstance()
diff --git a/gui/builtinAdditionPanes/notesView.py b/gui/builtinAdditionPanes/notesView.py
index 5c44a26c2..35a75b5a8 100644
--- a/gui/builtinAdditionPanes/notesView.py
+++ b/gui/builtinAdditionPanes/notesView.py
@@ -40,6 +40,8 @@ class NotesView(wx.Panel):
             self.lastFitId = event.fitID
             self.editNotes.SetValue(fit.notes or "")
 
+        event.Skip()
+
     def onText(self, event):
         # delay the save so we're not writing to sqlite on every keystroke
         self.saveTimer.Stop()  # cancel the existing timer
diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py
index b209da974..991e7d636 100644
--- a/gui/builtinAdditionPanes/projectedView.py
+++ b/gui/builtinAdditionPanes/projectedView.py
@@ -222,6 +222,8 @@ class ProjectedView(d.Display):
 
         self.update(stuff)
 
+        event.Skip()
+
     def get(self, row):
         numMods = len(self.modules)
         numDrones = len(self.drones)