From c7068ddac5dccff44710b154f9ad6c68d0bf7be2 Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.pievani@egalware>
Date: Tue, 7 Mar 2023 16:53:37 +0100
Subject: [PATCH] Migliorata gestione cambio configurazione

---
 EgtDOORCreator.vbproj             | 4 ++--
 MainWindow/MainWindowModel.vb     | 4 ++--
 My Project/AssemblyInfo.vb        | 4 ++--
 OptionsWindow/OptionsViewModel.vb | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/EgtDOORCreator.vbproj b/EgtDOORCreator.vbproj
index fb42b7a..12c6e2c 100644
--- a/EgtDOORCreator.vbproj
+++ b/EgtDOORCreator.vbproj
@@ -619,8 +619,8 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtDOORCreator\EgtDOORCreatorR32.exe
-IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtDOORCreator\EgtDOORCreatorD32.exe
+    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) C:\EgtProg\EgtDOORCreator\EgtDOORCreatorR32.exe
+IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) C:\EgtProg\EgtDOORCreator\EgtDOORCreatorD32.exe
 </PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/MainWindow/MainWindowModel.vb b/MainWindow/MainWindowModel.vb
index 3ab2fd1..7926977 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, 2501, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2501, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2531, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2531, 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 39bb6c9..b9e3990 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -72,5 +72,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.3.1")>
+<Assembly: AssemblyFileVersion("2.5.3.1")>
diff --git a/OptionsWindow/OptionsViewModel.vb b/OptionsWindow/OptionsViewModel.vb
index ed99a2b..e71740b 100644
--- a/OptionsWindow/OptionsViewModel.vb
+++ b/OptionsWindow/OptionsViewModel.vb
@@ -2066,8 +2066,8 @@ Public Class OptionsVM
          End If
       Next
 
-      If m_IsChangedConfig AndAlso EnableConfig AndAlso m_OrigBaseDir <> IniFile.m_sDoorsDirPath AndAlso m_OrigMTable <> OptionModule.m_SelectedMTable.Name Then
-         ' aggiorno il file Config.ini dell'EgtCAM5
+      If EnableConfig AndAlso m_IsChangedConfig Then
+         ' Se modifico il direttorio Compo: aggiorno il file Config.ini dell'EgtCAM5
          EgtLuaExecFile(IniFile.m_sConfigDir & "\ChangeConfig.lua")
          ' assegno variabili
          EgtLuaSetGlobStringVar("CCD.NewBaseDir", IniFile.m_sDoorsDirPath)