MS23032016

app/DD-Record-Organiser/ClassControlBuilder.vb

@@ -113,7 +113,11 @@ Public Class ClassControlBuilder
 
             Select Case control.GetType()
                 Case GetType(ComboBox)
-                    value = DirectCast(control, ComboBox).SelectedValue
+                    If IsNothing(DirectCast(control, ComboBox).ValueMember) Then
+                        value = DirectCast(control, ComboBox).Text
+                    Else
+                        value = DirectCast(control, ComboBox).SelectedValue
+                    End If
                 Case Else
                     Exit Sub
             End Select