diff --git a/Application.xaml.vb b/Application.xaml.vb index 4c3378a..0c96ca3 100644 --- a/Application.xaml.vb +++ b/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 diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 61e5175..c8caee5 100644 --- a/MainWindow/MainWindowM.vb +++ b/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 diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 9a54ef1..60702f8 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -59,5 +59,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +