From 3892dfc78cb5d100c04ecb864734b9d4485ef513 Mon Sep 17 00:00:00 2001 From: Ugur Ilter Date: Thu, 29 Aug 2024 11:04:33 +0300 Subject: [PATCH] fix arbitrary content being dragged and dropped causing errors Fixes #2630 --- gui/builtinAdditionPanes/boosterView.py | 4 ++++ gui/builtinAdditionPanes/cargoView.py | 4 ++++ gui/builtinAdditionPanes/commandView.py | 4 ++++ gui/builtinAdditionPanes/droneView.py | 4 ++++ gui/builtinAdditionPanes/fighterView.py | 4 ++++ gui/builtinAdditionPanes/implantView.py | 4 ++++ gui/builtinAdditionPanes/projectedView.py | 4 ++++ gui/builtinViews/fittingView.py | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py index 8ec82aa2a..f165913c8 100644 --- a/gui/builtinAdditionPanes/boosterView.py +++ b/gui/builtinAdditionPanes/boosterView.py @@ -43,6 +43,10 @@ class BoosterViewDrop(wx.DropTarget): if self.GetData(): dragged_data = DragDropHelper.data data = dragged_data.split(':') + + if dragged_data is None: + return t + self.dropFn(x, y, data) return t diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index de770749a..64f675f8d 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -41,6 +41,10 @@ class CargoViewDrop(wx.DropTarget): def OnData(self, x, y, t): if self.GetData(): dragged_data = DragDropHelper.data + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t diff --git a/gui/builtinAdditionPanes/commandView.py b/gui/builtinAdditionPanes/commandView.py index a18dab947..85bdd7416 100644 --- a/gui/builtinAdditionPanes/commandView.py +++ b/gui/builtinAdditionPanes/commandView.py @@ -56,6 +56,10 @@ class CommandViewDrop(wx.DropTarget): def OnData(self, x, y, t): if self.GetData(): dragged_data = DragDropHelper.data + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py index f8db01b7c..349850c48 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -52,6 +52,10 @@ class DroneViewDrop(wx.DropTarget): def OnData(self, x, y, t): if self.GetData(): dragged_data = DragDropHelper.data + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py index 40279b9bf..fcd08ab68 100644 --- a/gui/builtinAdditionPanes/fighterView.py +++ b/gui/builtinAdditionPanes/fighterView.py @@ -49,6 +49,10 @@ class FighterViewDrop(wx.DropTarget): def OnData(self, x, y, t): if self.GetData(): dragged_data = DragDropHelper.data + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py index cf717e7be..00b499c6d 100644 --- a/gui/builtinAdditionPanes/implantView.py +++ b/gui/builtinAdditionPanes/implantView.py @@ -46,6 +46,10 @@ class ImplantViewDrop(wx.DropTarget): def OnData(self, x, y, t): if self.GetData(): dragged_data = DragDropHelper.data + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py index 3e0969a14..4fbfbceab 100644 --- a/gui/builtinAdditionPanes/projectedView.py +++ b/gui/builtinAdditionPanes/projectedView.py @@ -65,6 +65,10 @@ class ProjectedViewDrop(wx.DropTarget): def OnData(self, x, y, t): if self.GetData(): dragged_data = DragDropHelper.data + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index e9f75e109..8df91591c 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -127,6 +127,10 @@ class FittingViewDrop(wx.DropTarget): if self.GetData(): dragged_data = DragDropHelper.data # pyfalog.debug("fittingView: recieved drag: " + self.dropData.GetText()) + + if dragged_data is None: + return t + data = dragged_data.split(':') self.dropFn(x, y, data) return t