From 79bcbb122bc56de42e193313ba08b68edcced191 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 27 Feb 2020 09:23:25 +0100
Subject: [PATCH] Fix gestione lettura file conf WPS (IOB-MAN --> IOB-WIN)

---
 IOB-WIN/IobWPS.cs | 6 +++++-
 Jenkinsfile       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs
index 2ddad2dd..b4aa9210 100644
--- a/IOB-WIN/IobWPS.cs
+++ b/IOB-WIN/IobWPS.cs
@@ -10,6 +10,7 @@ using System.IO;
 using System.Net.NetworkInformation;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace IOB_WIN
 {
@@ -74,7 +75,9 @@ namespace IOB_WIN
       string jsonConf = getOptPar("LUT_CONF");
       if (!string.IsNullOrEmpty(jsonConf))
       {
-        StreamReader reader = new StreamReader($"DATA/CONF/{jsonConf}");
+        string jsonFullPath = $"{Application.StartupPath}/DATA/CONF/{jsonConf}";
+        lgInfo($"Apertura file {jsonFullPath}");
+        StreamReader reader = new StreamReader(jsonFullPath);
         string jsonData = reader.ReadToEnd();
         if (!string.IsNullOrEmpty(jsonData))
         {
@@ -98,6 +101,7 @@ namespace IOB_WIN
         }
       }
       lgInfo("DONE reloadAdapterConf");
+      reader.Dispose();
       raiseRefresh(currDispData);
     }
 
diff --git a/Jenkinsfile b/Jenkinsfile
index acb0ed31..490efae6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=675']) {
+        withEnv(['NEXT_BUILD_NUMBER=676']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'