From 32caa179b937c94badea6fca555530df243efe41 Mon Sep 17 00:00:00 2001 From: Sora Date: Wed, 16 Oct 2024 22:47:01 +0200 Subject: [PATCH] Fix wrong channel update --- .github/workflows/build.yml | 4 ---- SA-Mod-Manager/UI/MainWindow.xaml.cs | 10 ++++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eecf5b51..ede6942f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,10 +26,6 @@ jobs: with: fetch-depth: 0 submodules: 'recursive' - - - name: Add Git hash to resources - working-directory: ${{env.GITHUB_WORKSPACE}} - run: echo ${{github.sha}} > SA-Mod-Manager/Resources/Version.txt - name: Setup AutoChangelog run: npm install -g auto-changelog diff --git a/SA-Mod-Manager/UI/MainWindow.xaml.cs b/SA-Mod-Manager/UI/MainWindow.xaml.cs index 07dcc562..346d6ec7 100644 --- a/SA-Mod-Manager/UI/MainWindow.xaml.cs +++ b/SA-Mod-Manager/UI/MainWindow.xaml.cs @@ -1371,13 +1371,14 @@ private void StartGame() public void SetModManagerVersion() { - if (string.IsNullOrEmpty(App.RepoCommit)) //dev + if (string.IsNullOrEmpty(App.RepoCommit)) //release { - Title = titleName + " " + "(Dev Build - " + Version + ")"; + Title = titleName + " " + "(" + Version + ")"; } else { - Title = titleName + " " + "(" + Version + " - " + App.RepoCommit[..7] + ")"; + Title = titleName + " " + "(Dev Build - " + Version + " - " + App.RepoCommit[..7] + ")"; + } } @@ -2910,9 +2911,6 @@ private async void ComboGameSelection_SelectionChanged(object sender, SelectionC private async void ComboBoxChannel_SelectionChanged(object sender, SelectionChangedEventArgs e) { - if (suppressEvent) - return; - bool isDev = !string.IsNullOrEmpty(App.RepoCommit); string currentChannel = isDev ? App.UpdateChannels[1] : App.UpdateChannels[0];