From e085328da860d13e23600d44aef83eb59767a40c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 20 Jun 2022 12:08:13 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20modalit=C3=A0=20decoder=20allarmi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP.MONO.DECODER/MP.MONO.DECODER.csproj   |  2 +-
 MP.MONO.DECODER/Program.cs               | 28 +++++++++++++-----------
 MP.MONO.DECODER/Resources/ChangeLog.html |  2 +-
 MP.MONO.DECODER/Resources/VersNum.txt    |  2 +-
 MP.MONO.DECODER/Resources/manifest.xml   |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 13c0bc2..489e7a8 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.12206.2011</Version>
+    <Version>1.12206.2012</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index eee124b..875005b 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -216,25 +216,25 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
                         {
                             isMuted = maybeMuted.Muted;
                         }
+                        // cerco l'allarme nell'elenco degli allarmi dal DB
+                        var foundAlarm = alarmsRecorded
+                                            .Where(x => x.FullValue == newAlarm)
+                                            .FirstOrDefault();
+                        // se non lo trovo --> chiamo procedura che verifica su DB, eventualmente inserisce, restituisce nuovo elenco
+                        if (foundAlarm == null)
+                        {
+                            // salvo sul DB
+                            foundAlarm = dbController.AlarmListInsert(newAlarm);
+                            // ora rileggo ed aggiorno redis e cerco di nuovo record...
+                            alarmsRecorded = dbController.AlarmListGetAll();
+                            redisDb.StringSet(Constants.ALARMS_RLIST_KEY, JsonConvert.SerializeObject(alarmsRecorded));
+                        }
                         if (!isMuted && lastAlarms != null)
                         {
                             if (!lastAlarms.Contains(newAlarm))
                             {
-                                // cerco l'allarme nell'elenco degli allarmi dal DB
-                                var foundAlarm = alarmsRecorded
-                                                    .Where(x => x.FullValue == newAlarm)
-                                                    .FirstOrDefault();
-                                // se non lo trovo --> chiamo procedura che verifica su DB, eventualmente inserisce, restituisce nuovo elenco
-                                if (foundAlarm == null)
-                                {
-                                    // salvo sul DB
-                                    foundAlarm = dbController.AlarmListInsert(newAlarm);
-                                }
                                 if (foundAlarm != null)
                                 {
-                                    // ora rileggo ed aggiorno redis e cerco di nuovo record...
-                                    alarmsRecorded = dbController.AlarmListGetAll();
-                                    redisDb.StringSet(Constants.ALARMS_RLIST_KEY, JsonConvert.SerializeObject(alarmsRecorded));
 
                                     // segno come iniziato...
                                     AlarmRecModel newAlarmRec = new AlarmRecModel()
@@ -248,6 +248,8 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
                                 }
                             }
                         }
+                        else
+                        { }
                     }
 
                 }
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index ad00c3a..adbf6f1 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.12206.2011</h4>
+    <h4>Version: 1.12206.2012</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 45ef716..17bc89b 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.12206.2011
+1.12206.2012
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index b7820fa..3975f12 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.12206.2011</version>
+  <version>1.12206.2012</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>