Skip to content

Commit

Permalink
Fix wrong channel update
Browse files Browse the repository at this point in the history
  • Loading branch information
Sora-yx committed Oct 16, 2024
1 parent a12a81e commit 32caa17
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions SA-Mod-Manager/UI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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] + ")";

}
}

Expand Down Expand Up @@ -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];

Expand Down

0 comments on commit 32caa17

Please sign in to comment.