From d2fdcea5cd10e5778183e4ee507f521ae28ef451 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 14 Sep 2016 14:27:19 +0200 Subject: [PATCH] fix: check if hdv-class is valid --- VECTO/GUI/VectoJobForm.vb | 5 +++-- VECTO/GUI/VehicleForm.vb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb index 506de305ee..ff84f9c9ec 100644 --- a/VECTO/GUI/VectoJobForm.vb +++ b/VECTO/GUI/VectoJobForm.vb @@ -1016,7 +1016,7 @@ lbDlog: VEH0.FilePath = fFileRepl(TbVEH.Text, GetPath(VECTOfile)) If VEH0.ReadFile(False) Then - Dim maxMass = (VEH0.MassMax * 1000).SI(Of Kilogram)() 'CSng(fTextboxToNumString(TbMassMass.Text)) + Dim maxMass = (VEH0.MassMax * 1000).SI(Of Kilogram)() 'CSng(fTextboxToNumString(TbMassMass.Text)) Dim s0 As Segment = Nothing Try @@ -1037,7 +1037,8 @@ lbDlog: HDVclass = "-" End If - PicVehicle.Image = ConvPicPath(HDVclass.ToInt(), False) 'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False)) + PicVehicle.Image = ConvPicPath(If(s0 Is Nothing, -1, HDVclass.ToInt()), False) _ + 'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False)) TbHVCclass.Text = "HDV Class " & HDVclass TbVehCat.Text = VEH0.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True) diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb index bf978bea02..58ddeeab12 100644 --- a/VECTO/GUI/VehicleForm.vb +++ b/VECTO/GUI/VehicleForm.vb @@ -122,7 +122,7 @@ Public Class VehicleForm TbHDVclass.Text = _hdVclass - PicVehicle.Image = ConvPicPath(_hdVclass.ToInt(), False) + PicVehicle.Image = ConvPicPath(If(s0 Is Nothing, -1, _hdVclass.ToInt()), False) End Sub -- GitLab