Átállás 17.2.3-ra

Related Work Items: #123
2017-12-02 16:09:26 +01:00
parent 2b2f1b201c
commit 9cca882b34
201 changed files with 16991 additions and 3617 deletions
@@ -42,7 +42,7 @@ Public Class UniqueObjects_VC

    Private Sub aMergeUniqueObjects_Execute(sender As Object, e As SimpleActionExecuteEventArgs) Handles aMergeUniqueObjects.Execute
        Try
-            Frame.GetController(Of Validation.PersistenceValidationController).Active.SetItemValue("", False)
+            Frame.GetController(Of Validation.PersistenceValidationController)?.Active.SetItemValue("", False)
            Dim _onew As Xpo.XPObjectSpace = Application.CreateObjectSpace
            Dim _Object As Object
            Dim _UniqueObjects As UniqueObjects
@@ -69,7 +69,7 @@ Public Class UniqueObjects_VC
        Catch ex As Exception
            MsgBox(ex.Message)
        Finally
-            Frame.GetController(Of Validation.PersistenceValidationController).Active.SetItemValue("", True)
+            Frame.GetController(Of Validation.PersistenceValidationController)?.Active.SetItemValue("", True)
        End Try
    End Sub
 End Class