Merge commit '98052f4a8ec62724885d3eb638bb8d29852a1d1e' into develop

Application.xaml.vb

@@ -1,14 +1,21 @@
-Class Application
+Imports EgtPHOTOLib
 
-    ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
-    ' can be handled in this file.
+Class Application
+
+   ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
+   ' can be handled in this file.
    Protected Overrides Sub OnStartup(e As StartupEventArgs)
       MyBase.OnStartup(e)
       ShutdownMode = System.Windows.ShutdownMode.OnMainWindowClose
       ' Creo la View principale
       Me.MainWindow = New MainWindowV
       ' Mostro la View principale
-      Me.MainWindow.Show()
+      If PhotoMap.ContinueApplication Then
+         Me.MainWindow.Show()
+      Else
+         End
+      End If
+
    End Sub
 
 End Class

MainWindow/MainWindowM.vb

@@ -202,8 +202,8 @@ Public Class MainWindowM
       Dim bNetHwKey As Boolean = ( GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1)
       EgtSetNetHwKey( bNetHwKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2501, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2501, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2502, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2502, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -278,9 +278,6 @@ Public Class MainWindowM
          MessageBox.Show(EgtMsg(MSG_OMAGPHOTO + 1) & EgtMsg(MSG_OMAGPHOTO + 2), EgtMsg(MSG_EGTMSGBOX + 15), MessageBoxButton.OK, MessageBoxImage.Error)
          End
       End If
-
-      Dim sLastBlock As String = String.Empty
-
       ' Info su opzioni chiave
       EgtOutLog("KeyOptions : " & bKey.ToString() & " " & m_nKeyOptions.ToString() & " " & bProd.ToString())
       ' Imposto parametri EgtPHOTOLib
@@ -295,6 +292,7 @@ Public Class MainWindowM
       EgtPHOTOLib.MainData.SetZebraPrinterExe(m_ZebraUtilitiesExe)
       EgtPHOTOLib.MainData.SetPrinterVisibility(m_PrinterIsVisible)
       EgtPHOTOLib.MainData.SetCapsLock(m_bCapsLock)
+      Dim sLastBlock As String = String.Empty
       If GetMainPrivateProfileString(S_GENERAL, "LastBlock", "", sLastBlock) <> 0 Then EgtPHOTOLib.MainData.SetLastBlock(sLastBlock)
       Dim sIdKey As String = String.Empty
       EgtGetKeyInfo(sIdKey)
@@ -307,7 +305,8 @@ Public Class MainWindowM
 
    ' per la gestione di due OmagPHOTO che accedono allo stesso SQL
    Private Sub RefreshTimer_Tick()
-      If Not m_TimerIsBusy And PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
+      If Not m_TimerIsBusy AndAlso Not IsNothing(PhotoMap.refProjectVM) AndAlso
+         PhotoMap.refProjectVM.SelProjectMode = ProjectSlabVM.ProjectModeOpt.LIST Then
          m_TimerIsBusy = True
          m_RefreshTimer.Stop()
          EgtPHOTOLib.PhotoMap.refListPageVM.RefreshLisPage()

My Project/AssemblyInfo.vb

@@ -18,8 +18,8 @@ Imports System.Windows
 <Assembly: AssemblyDescription("OmagPHOTO 32 bit")> 
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")> 
-<Assembly: AssemblyProduct("OmagPHOTO")> 
-<Assembly: AssemblyCopyright("Copyright ©  2017-2022 by Egalware s.r.l.")> 
+<Assembly: AssemblyProduct("OmagPHOTO")>
+<Assembly: AssemblyCopyright("Copyright ©  2017-2023 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")> 
 <Assembly: ComVisible(false)>
 
@@ -59,5 +59,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.1.1")>
-<Assembly: AssemblyFileVersion("2.5.1.1")>
+<Assembly: AssemblyVersion("2.5.2.1")>
+<Assembly: AssemblyFileVersion("2.5.2.1")>