fix chat log not refreshing

fix problem with StoredShips event in odyssey
mhwlng · May 24, 2021 · 93c6be5 · 93c6be5
1 parent 6b90603
commit 93c6be5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/Elite/Data.cs b/Elite/Data.cs
@@ -2103,7 +2103,7 @@ public static void HandleEliteEvents(object sender, JournalEventArgs e)
 
             }
 
-            if (evt != "FSSSignalDiscovered" && evt != "FSSDiscoveryScan" && evt != "Music" && evt != "ReceiveText" && evt != "FuelScoop" && evt != "ReservoirReplenished")
+            if (evt != "FSSSignalDiscovered" && evt != "FSSDiscoveryScan" && evt != "Music" /*&& evt != "ReceiveText"*/ && evt != "FuelScoop" && evt != "ReservoirReplenished")
             {
                 App.FipHandler.RefreshDevicePages();
             }

diff --git a/Elite/Elite.csproj b/Elite/Elite.csproj
@@ -240,9 +240,7 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="app.manifest" />
-    <None Include="mqtt.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="mqtt.config" />
     <None Include="appsettings.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/Elite/Ships.cs b/Elite/Ships.cs
@@ -336,6 +336,12 @@ public static void HandleShipyardBuy(ShipyardBuyEvent.ShipyardBuyEventArgs info)
 
         public static void HandleStoredShips(StoredShipsEvent.StoredShipsEventArgs info)
         {
+            // always empty in odyssey ????
+
+            // { "timestamp":"2021-05-24T07:56:19Z", "event":"StoredShips", "StationName":"Jameson Memorial", "MarketID":128666762, "StarSystem":"Shinrarta Dezhra", "ShipsHere":[  ], "ShipsRemote":[  ] }
+
+            if (info.ShipsHere?.Any() != true) return;
+
             foreach (var s in ShipsList)
             {
                 s.Stored = false;

diff --git a/Elite/Templates/cardcaption.cshtml b/Elite/Templates/cardcaption.cshtml
@@ -26,31 +26,31 @@
     {
         if (Model.CurrentCard == 0)
         {
-            <div class="cardcaption">&#x25c0; Chat Star System &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Star System &#x25b6;</div>
         }
         else if (Model.CurrentCard == 1)
         {
-            <div class="cardcaption">&#x25c0; Chat Local &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Local &#x25b6;</div>
         }
         else if (Model.CurrentCard == 2)
         {
-            <div class="cardcaption">&#x25c0; Chat Friend &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Friend &#x25b6;</div>
         }
         else if (Model.CurrentCard == 3)
         {
-            <div class="cardcaption">&#x25c0; Chat Player &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Player &#x25b6;</div>
         }
         else if (Model.CurrentCard == 4)
         {
-            <div class="cardcaption">&#x25c0; Chat Wing &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Wing &#x25b6;</div>
         }
         else if (Model.CurrentCard == 5)
         {
-            <div class="cardcaption">&#x25c0; Chat Squadron &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Squadron &#x25b6;</div>
         }
         else if (Model.CurrentCard == 6)
         {
-            <div class="cardcaption">&#x25c0; Chat Voice &#x25b6;</div>
+            <div class="cardcaption">&#x25c0; Chat : Voice &#x25b6;</div>
         }
     }
     else if (Model.CurrentTab == LcdTab.HWInfo)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
-                if (evt != "FSSSignalDiscovered" && evt != "FSSDiscoveryScan" && evt != "Music" && evt != "ReceiveText" && evt != "FuelScoop" && evt != "ReservoirReplenished")
+                if (evt != "FSSSignalDiscovered" && evt != "FSSDiscoveryScan" && evt != "Music" /*&& evt != "ReceiveText"*/ && evt != "FuelScoop" && evt != "ReservoirReplenished")
                 {
                     App.FipHandler.RefreshDevicePages();
                 }
@@ Expand Down @@