AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LookupGrid: Prevent crash when selectedvalues contains dbnull

Browse Source
This commit is contained in:
Jonathan Jenne 2020-05-20 13:57:12 +02:00
parent 968ea6c914
commit 5d4133659e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Controls.LookupGrid/frmLookupGrid.vb
View File

@ -70,6 +70,8 @@ Public Class frmLookupGrid
If SelectedValues Is Nothing Then If SelectedValues Is Nothing Then
SelectedValues = New List(Of String) SelectedValues = New List(Of String)
Else
SelectedValues = SelectedValues.Where(Function(v) Not (IsDBNull(v) OrElse String.IsNullOrWhiteSpace(v))).ToList()
End If End If
' Bereits ausgewählte Werte im grid auswählen ' Bereits ausgewählte Werte im grid auswählen
@ -131,14 +133,18 @@ Public Class frmLookupGrid
Dim row As DataRow = rowView.Row Dim row As DataRow = rowView.Row
Dim value = row.Item(_DataColumn) Dim value = row.Item(_DataColumn)
If SelectedValues.Contains(value) Then If Not (IsDBNull(value) OrElse String.IsNullOrWhiteSpace(value)) Then
If MultiSelect Then If SelectedValues.Contains(value) Then
row.Item(0) = True If MultiSelect Then
Else row.Item(0) = True
view.SelectRow(rowHandle) Else
view.SelectRow(rowHandle)
End If
End If End If
End If End If
End If End If
Next Next
End If End If
End Sub End Sub