Skip to content

Commit

Permalink
Merge pull request #2 from spreedated/dev
Browse files Browse the repository at this point in the history
~ Hotfix version check
  • Loading branch information
spreedated authored Jun 11, 2020
2 parents a56ee38 + 0b05f8c commit 8fc8961
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion FlacSquisher/Classes/FConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class Options

public static class FSConfig
{
public static Version ConfigVersion = new Version(1, 0, 0, 4);
public static Version ConfigVersion = new Version(1, 0, 1, 0);
public static FSConfigJObject Config { get; set; } = null;
}

Expand Down
4 changes: 2 additions & 2 deletions FlacSquisher/Classes/Update.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public async void StartupCheck()
return;
}

if (Assembly.GetExecutingAssembly().GetName().Version < this.GitHubResponse.Version)
if (Assembly.GetExecutingAssembly().GetName().Version < new Version(this.GitHubResponse.Version.Major, this.GitHubResponse.Version.Minor, this.GitHubResponse.Version.Build,0))
{
GotResponse(this, new EventArgsResponse() { Response = "New version available! - " + this.GitHubResponse.Version.ToString()});
}
else if (Assembly.GetExecutingAssembly().GetName().Version > this.GitHubResponse.Version)
else if (Assembly.GetExecutingAssembly().GetName().Version > new Version(this.GitHubResponse.Version.Major, this.GitHubResponse.Version.Minor, this.GitHubResponse.Version.Build, 0))
{
GotResponse(this, new EventArgsResponse() { Response = "You have a newer version than online!" });
}
Expand Down
2 changes: 1 addition & 1 deletion FlacSquisher/FlacSquisher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ApplicationIcon>Resources\FlacSquisherIcon.ico</ApplicationIcon>
<StartupObject>FlacSquisher.App</StartupObject>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Version>2.0.3.0</Version>
<Version>2.0.4.0</Version>
<Copyright>2020 Markus Karl Wackermann</Copyright>
<Description>FlacSquisher converts a library of Flac files to MP3, Opus, or Ogg Vorbis format, maintaining the directory structure in the original library. That way, you can maintain your Flac files for home listening, and easily convert them to MP3, Opus, or Ogg format for mobile use, where storage space is more often tightly constrained.</Description>
<Authors>Markus Karl Wackermann</Authors>
Expand Down
4 changes: 2 additions & 2 deletions FlacSquisher/Windows/VersionCheck.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ private async void DoUpdateCheck()
return;
}

if (Assembly.GetExecutingAssembly().GetName().Version < UpdateObj.GitHubResponse.Version)
if (Assembly.GetExecutingAssembly().GetName().Version < new Version(UpdateObj.GitHubResponse.Version.Major, UpdateObj.GitHubResponse.Version.Minor, UpdateObj.GitHubResponse.Version.Build, 0))
{
TXB_SomeCoolText.Text = "Good news!\nNew version available.";
}
else if (Assembly.GetExecutingAssembly().GetName().Version > UpdateObj.GitHubResponse.Version)
else if (Assembly.GetExecutingAssembly().GetName().Version > new Version(UpdateObj.GitHubResponse.Version.Major, UpdateObj.GitHubResponse.Version.Minor, UpdateObj.GitHubResponse.Version.Build, 0))
{
TXB_SomeCoolText.Text = "Cool!\nYou have a newer version than online. You wizard!";
BTN_Download.IsEnabled = false;
Expand Down

0 comments on commit 8fc8961

Please sign in to comment.