From d5f2c81876daddff67ecec8c56bc9e23721543bd Mon Sep 17 00:00:00 2001
From: Nicola Pievani <nicola.p@egaltech.com>
Date: Fri, 3 Aug 2018 16:40:16 +0000
Subject: [PATCH]

---
 RegexFunction.vb | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/RegexFunction.vb b/RegexFunction.vb
index 081e071..65842bc 100644
--- a/RegexFunction.vb
+++ b/RegexFunction.vb
@@ -22,21 +22,22 @@ Module RegexFunction
             Dim ConfigurationCompo As String = Regex.Match(sLine, "\s*:\s*(.*?)\s*$").Groups(1).Value
             If Not String.IsNullOrWhiteSpace(ConfigurationCompo) AndAlso
                ConfigurationCompo <> Path.GetFileName(IniFile.m_sDoorsDirPath) Then
-               Dim MsgBoxResult As MessageBoxResult = MessageBoxResult.No
-               ' 50195=The current ddf configuration ({0}) is different from the current program configuration ({1}).
-               Dim sWarningMas As String = String.Format(EgtMsg(50195), ConfigurationCompo, Path.GetFileName(IniFile.m_sDoorsDirPath))
-               MsgBoxResult = MessageBox.Show(sWarningMas, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
-               If MsgBoxResult = MessageBoxResult.Yes Then
-                  If Directory.Exists("C:\EgtData\Doors\" & ConfigurationCompo) Then
+               If Not Directory.Exists("C:\EgtData\Doors\" & ConfigurationCompo) Then
+                  ' 50196=Configuration program ({0}) does not exist!
+                  Dim sErrorMsg As String = String.Format(EgtMsg(50196), ConfigurationCompo)
+                  MessageBox.Show(sErrorMsg, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+               Else
+                  Dim MsgBoxResult As MessageBoxResult = MessageBoxResult.No
+                  ' 50195=The current ddf configuration ({0}) is different from the current program configuration ({1}).
+                  Dim sWarningMas As String = String.Format(EgtMsg(50195), ConfigurationCompo, Path.GetFileName(IniFile.m_sDoorsDirPath))
+                  MsgBoxResult = MessageBox.Show(sWarningMas, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning)
+                  If MsgBoxResult = MessageBoxResult.Yes Then
                      WriteMainPrivateProfileString("Doors", "BaseDir", "C:\EgtData\Doors\" & ConfigurationCompo)
-                  Else
-                     ' 50196=Configuration program ({0}) does not exist!
-                     Dim sErrorMsg As String = String.Format(EgtMsg(50196), ConfigurationCompo)
-                     MessageBox.Show(sErrorMsg, "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+                     EgtExit()
+                     Application.Current.MainWindow.Close()
+                     ' esci dall'applicazione
+                     End
                   End If
-                  EgtExit()
-                  Application.Current.MainWindow.Close()
-                  End
                End If
             End If
          End If