mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 19:02:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump version; updater improvements

Browse source
This commit is contained in:
Royce551 2020-11-07 22:09:53 -06:00
parent 3ba18045ae
commit de19944fb1
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Handlers/UpdateHandler.cs
View file

@ -67,8 +67,8 @@ namespace FRESHMusicPlayer.Handlers
}
private static void RestartApp()
{
WinForms.Application.Restart();
Application.Current.Shutdown();
WinForms.Application.Restart();
}
}
}

2
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml
View file

@ -89,7 +89,7 @@
<TextBlock Text="{x:Static resx:Resources.SETTINGS_ABOUT}" Foreground="{StaticResource PrimaryTextColor}" FontSize="18" FontWeight="Bold" TextAlignment="Center" Padding="0,5,0,5" Margin="-10,0,0,0"/>
<TextBlock Text="FRESHMusicPlayer Ver. 8.1" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5"/>
<TextBlock Text="FRESHMusicPlayer Ver. 8.2" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5"/>
<TextBlock x:Name="FMPCoreVersionLabel" Text="FMP Core version placeholder" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5"/>
<TextBlock Text="{x:Static resx:Resources.SETTINGS_CREDITS}" Foreground="{StaticResource PrimaryTextColor}" FontSize="14" Padding="0,0,0,5" TextWrapping="Wrap"/>
</StackPanel>

4
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Pages/Settings/SettingsPage.xaml.cs
View file

@ -15,7 +15,7 @@ namespace FRESHMusicPlayer.Pages
public bool AppRestartNeeded = false;
private bool pageInitialized = false;
private readonly ConfigurationFile workingConfig = new ConfigurationFile(); // Instance of config that's compared to the actual config file to set AppRestartNeeded.
private readonly ConfigurationFile workingConfig = new ConfigurationFile { Language = App.Config.Language, Theme = App.Config.Theme }; // Copy of config that's compared to the actual config file to set AppRestartNeeded.
public SettingsPage()
{
@ -189,8 +189,8 @@ namespace FRESHMusicPlayer.Pages
private void RestartNowButton_Click(object sender, RoutedEventArgs e)
{
WinForms.Application.Restart();
Application.Current.Shutdown();
WinForms.Application.Restart();
}
private async void Updates_CheckUpdatesButton_Click(object sender, RoutedEventArgs e) => await UpdateHandler.UpdateApp();

6
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Properties/AssemblyInfo.cs
View file

@ -51,6 +51,6 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.1.0.0")]
[assembly: AssemblyFileVersion("8.1.0.0")]
[assembly: AssemblyInformationalVersion("FRESHMusicPlayer Ver. 8.1")]
[assembly: AssemblyVersion("8.2.0.0")]
[assembly: AssemblyFileVersion("8.2.0.0")]
[assembly: AssemblyInformationalVersion("FRESHMusicPlayer Ver. 8.2")]