diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb index 16023f5..c89243c 100644 --- a/MainWindow/MainWindowModel.vb +++ b/MainWindow/MainWindowModel.vb @@ -57,8 +57,8 @@ Friend Class MainWindowModel EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile) EgtSetKey(sKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(3279, 2307, 1, IniFile.m_nKeyLevel) And - EgtGetKeyOptions(3279, 2307, 1, IniFile.m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(3279, 2308, 1, IniFile.m_nKeyLevel) And + EgtGetKeyOptions(3279, 2308, 1, IniFile.m_nKeyOptions) 'Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index b448b7d..7d308a6 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -72,5 +72,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/RegexFunction.vb b/RegexFunction.vb index 2b9287f..60082da 100644 --- a/RegexFunction.vb +++ b/RegexFunction.vb @@ -79,8 +79,9 @@ Module RegexFunction If Not sLine.Contains("Config") Then Return False ' Processo il tipo di configurazione Dim ConfigurationCompo As String = Regex.Match(sLine, "\s*:\s*(.*?)\s*$").Groups(1).Value + ' verifico che il nome della configurazione del file DDF sia uguale a quella presente nel file Config.ini a meno delle "maiscuole" If Not String.IsNullOrWhiteSpace(ConfigurationCompo) AndAlso - ConfigurationCompo <> Path.GetFileName(IniFile.m_sDoorsDirPath) Then + ConfigurationCompo.ToLower <> Path.GetFileName(IniFile.m_sDoorsDirPath).ToLower Then Dim sConfCompoPath As String = Path.GetDirectoryName(IniFile.m_sDoorsDirPath) & "\" & ConfigurationCompo If Not Directory.Exists(sConfCompoPath) Then ' 50196=Configuration program ({0}) does not exist!