Merge remote-tracking branch 'ebag/ActiveDroneStacking'

2017-02-15 21:01:28 -05:00
parent 0a37834fd8 a865028420
commit 3f46db55b6
2 changed files with 9 additions and 2 deletions
--- a/gui/droneView.py
+++ b/gui/droneView.py
@@ -147,6 +147,7 @@ class DroneView(Display):
    def _merge(self, src, dst):
        sFit = Fit.getInstance()
        fitID = self.mainFrame.getActiveFit()
+
        if sFit.mergeDrones(fitID, self.drones[src], self.drones[dst]):
            wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))