Merge remote-tracking branch 'gitlab.seriate/DataLayer' into Selection&Highlight

- Correzione in assenza di macchine
Merge branch 'TestOracleMysql' into DataLayer
2022-07-19 16:43:25 +02:00 · 2022-07-19 16:42:10 +02:00 · 2022-07-19 16:40:29 +02:00
1 changed files with 1 additions and 1 deletions
@@ -643,7 +643,7 @@ Public Class ProjManagerVM
      Dim Machine As Machine = Nothing
      Dim nType As BWType = BWType.NULL
      Dim ProjectTypeWndVM As New ProjectTypeWndVM()
-      If ProjectTypeWndVM.MachineList.Count = 1 And DirectCast(ProjectTypeWndVM.SelMachine, MyMachine).nType <> MachineType.BOTH Then
+      If ProjectTypeWndVM.MachineList.Count = 1 AndAlso DirectCast(ProjectTypeWndVM.SelMachine, MyMachine).nType <> MachineType.BOTH Then
         Machine = ProjectTypeWndVM.SelMachine
         nType = DirectCast(Machine, MyMachine).nType
      Else
Author	SHA1	Message	Date
Emmanuele Sassi	47d0fef508	Merge remote-tracking branch 'gitlab.seriate/DataLayer' into Selection&Highlight	2022-07-19 16:43:25 +02:00
Emmanuele Sassi	2bbd407019	- Correzione in assenza di macchine	2022-07-19 16:42:10 +02:00
Samuele Locatelli	abc2c4fe07	Merge branch 'TestOracleMysql' into DataLayer	2022-07-19 16:40:29 +02:00