Skip to content

Commit 7edf1f9

Browse files
authored
Merge pull request #2631 from ugurilter/master
fix arbitrary content being dragged and dropped causing errors
2 parents 31cfa7c + 3892dfc commit 7edf1f9

File tree

8 files changed

+32
-0
lines changed

8 files changed

+32
-0
lines changed

gui/builtinAdditionPanes/boosterView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ def OnData(self, x, y, t):
4343
if self.GetData():
4444
dragged_data = DragDropHelper.data
4545
data = dragged_data.split(':')
46+
47+
if dragged_data is None:
48+
return t
49+
4650
self.dropFn(x, y, data)
4751
return t
4852

gui/builtinAdditionPanes/cargoView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ def __init__(self, dropFn, *args, **kwargs):
4141
def OnData(self, x, y, t):
4242
if self.GetData():
4343
dragged_data = DragDropHelper.data
44+
45+
if dragged_data is None:
46+
return t
47+
4448
data = dragged_data.split(':')
4549
self.dropFn(x, y, data)
4650
return t

gui/builtinAdditionPanes/commandView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ def __init__(self, dropFn, *args, **kwargs):
5656
def OnData(self, x, y, t):
5757
if self.GetData():
5858
dragged_data = DragDropHelper.data
59+
60+
if dragged_data is None:
61+
return t
62+
5963
data = dragged_data.split(':')
6064
self.dropFn(x, y, data)
6165
return t

gui/builtinAdditionPanes/droneView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ def __init__(self, dropFn, *args, **kwargs):
5252
def OnData(self, x, y, t):
5353
if self.GetData():
5454
dragged_data = DragDropHelper.data
55+
56+
if dragged_data is None:
57+
return t
58+
5559
data = dragged_data.split(':')
5660
self.dropFn(x, y, data)
5761
return t

gui/builtinAdditionPanes/fighterView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ def __init__(self, dropFn, *args, **kwargs):
5252
def OnData(self, x, y, t):
5353
if self.GetData():
5454
dragged_data = DragDropHelper.data
55+
56+
if dragged_data is None:
57+
return t
58+
5559
data = dragged_data.split(':')
5660
self.dropFn(x, y, data)
5761
return t

gui/builtinAdditionPanes/implantView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ def __init__(self, dropFn, *args, **kwargs):
4646
def OnData(self, x, y, t):
4747
if self.GetData():
4848
dragged_data = DragDropHelper.data
49+
50+
if dragged_data is None:
51+
return t
52+
4953
data = dragged_data.split(':')
5054
self.dropFn(x, y, data)
5155
return t

gui/builtinAdditionPanes/projectedView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ def __init__(self, dropFn, *args, **kwargs):
6565
def OnData(self, x, y, t):
6666
if self.GetData():
6767
dragged_data = DragDropHelper.data
68+
69+
if dragged_data is None:
70+
return t
71+
6872
data = dragged_data.split(':')
6973
self.dropFn(x, y, data)
7074
return t

gui/builtinViews/fittingView.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ def OnData(self, x, y, t):
127127
if self.GetData():
128128
dragged_data = DragDropHelper.data
129129
# pyfalog.debug("fittingView: recieved drag: " + self.dropData.GetText())
130+
131+
if dragged_data is None:
132+
return t
133+
130134
data = dragged_data.split(':')
131135
self.dropFn(x, y, data)
132136
return t

0 commit comments

Comments
 (0)