From 4017482895a0a51f54a15a59cbe5b56e9e9a8d32 Mon Sep 17 00:00:00 2001
From: Keelah <al.loncham@gmail.com>
Date: Sun, 13 Oct 2024 02:22:26 +0200
Subject: [PATCH] hotfix pipeline and About page

Fixes #212
---
 .github/workflows/release.yml | 13 +++++++++++--
 FASTER/FASTER.csproj          |  2 +-
 FASTER/Views/About.xaml       |  2 +-
 FASTER_Version.xml            |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7c835e37..56808bec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -114,9 +114,18 @@ jobs:
         # Take the first tag as latestTag
         $latestTag = ($tags -split "`n")[0]
 
-        $range = "$latestTag" + "..@"
-
         # Get changes for range
+        # Check if the latest tag is on the last commit
+        $latestCommit = git rev-parse HEAD
+        $latestTagCommit = git rev-list -n 1 $latestTag
+
+        if ($latestCommit -eq $latestTagCommit -and $countTags -gt 1) {
+            # Use the previous tag if the latest tag is on the last commit
+            $latestTag = ($tags -split "`n")[1]
+            
+        }
+
+        $range = "$latestTag" + "..@"
         $changes = git log --pretty=reference --no-decorate $range
 
         
diff --git a/FASTER/FASTER.csproj b/FASTER/FASTER.csproj
index a1995f48..70a663f5 100644
--- a/FASTER/FASTER.csproj
+++ b/FASTER/FASTER.csproj
@@ -10,7 +10,7 @@
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>FASTERKey.snk</AssemblyOriginatorKeyFile>
 		<Authors>Keelah Fox, Jupster, Canno.n</Authors>
-		<Version>1.9.6.0</Version>
+		<Version>1.9.6.1</Version>
 		<Company>FoxliCorp.</Company>
 		<Description>Fox's Arma Server Tool Extended Rewrite</Description>
 		<Copyright>Copyright © 2019</Copyright>
diff --git a/FASTER/Views/About.xaml b/FASTER/Views/About.xaml
index 382fee08..9c0d662f 100644
--- a/FASTER/Views/About.xaml
+++ b/FASTER/Views/About.xaml
@@ -79,7 +79,7 @@
                         </Button>
                         <Button Grid.Column="2" HorizontalAlignment="Center" Style="{DynamicResource MahApps.Styles.Button.MetroSquare.Accent}" Name="IDiscordButton" Click="IDiscordButton_Click">
                             <StackPanel Orientation="Horizontal">
-                                <iconPacks:PackIconMaterial Kind="Discord" />
+                                <iconPacks:PackIconMaterial Kind="Chat" />
                                 <TextBlock Margin="8 0 0 0" VerticalAlignment="Center">Discord</TextBlock>
                             </StackPanel>
                         </Button>
diff --git a/FASTER_Version.xml b/FASTER_Version.xml
index b84a37be..b1f15c50 100644
--- a/FASTER_Version.xml
+++ b/FASTER_Version.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.9.6.0</version>
+  <version>1.9.6.1</version>
   <url>https://github.com/Foxlider/FASTER/releases/latest/download/Release_x64.zip</url>
   <changelog>https://github.com/Foxlider/FASTER/releases</changelog>
   <mandatory>true</mandatory>