diff --git a/UID/Dienstplan/frmDienstplanVariabel.vb b/UID/Dienstplan/frmDienstplanVariabel.vb index d134d5d..f15858e 100644 --- a/UID/Dienstplan/frmDienstplanVariabel.vb +++ b/UID/Dienstplan/frmDienstplanVariabel.vb @@ -1083,12 +1083,14 @@ Public Class frmDienstplanVariabel End If ' ctxtDgvSchicht1.Items(0).Text = String.Format("This is the cell at {0}, {1}", ht.ColumnIndex, ht.RowIndex) + If o IsNot Nothing Then + If o.SCHICHT.dedet_Splitschicht = True Then + thisDgv.ContextMenuStrip = ContextMenuStrip1 + If thisDgv.SelectedCells.Count = 0 Then + thisDgv.CurrentCell = thisDgv(ht.ColumnIndex, ht.RowIndex) + thisDgv.CurrentCell.Selected = True - If o.SCHICHT.dedet_Splitschicht = True Then - thisDgv.ContextMenuStrip = ContextMenuStrip1 - If thisDgv.SelectedCells.Count = 0 Then - thisDgv.CurrentCell = thisDgv(ht.ColumnIndex, ht.RowIndex) - thisDgv.CurrentCell.Selected = True + End If End If @@ -1096,7 +1098,7 @@ Public Class frmDienstplanVariabel End If - Else + Else RemoveHandler DirectCast(sender, DataGridView).KeyDown, AddressOf changeByKey AddHandler thisDgv.KeyDown, AddressOf changeByKey @@ -2094,6 +2096,11 @@ Public Class frmDienstplanVariabel Dim o As usrCntlDienstWoche = Nothing If dgv_tmp.Parent.Parent.GetType() Is GetType(usrCntlDienstWoche) Then o = dgv_tmp.Parent.Parent + If o Is Nothing Then + MsgBox("Keine Splitschichten erlaubt!") + Exit Sub + End If + If o.SCHICHT.dedet_Hauptsplitschicht = False Then MsgBox("In Schicht " & o.schicht_name & " sind keine Splitschichten erlaubt!")