ckaczor/FeedCenter
1
0
Fork 0
mirror of https://github.com/ckaczor/FeedCenter.git synced 2026-01-26 17:23:56 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'main' into prerelease

Browse Source 
# Conflicts:
#	Application/FeedCenter.csproj
#	Application/Properties/Resources.resx
This commit is contained in:
Chris Kaczor
2025-09-25 12:53:39 -04:00
parent 41029671dc f3145d8811
commit 636c7f9b2a
11 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Application/MainWindow/FeedReading.cs
View File

@@ -213,7 +213,7 @@ public partial class MainWindow
if (DateTime.Now - Settings.Default.LastVersionCheck >= Settings.Default.VersionCheckInterval)
{
// Get the update information
UpdateCheck.CheckForUpdate().Wait();
UpdateCheck.CheckForUpdate(Settings.Default.IncludePrerelease).Wait();
// Update the last check time
Settings.Default.LastVersionCheck = DateTime.Now;

2
Application/MainWindow/MainWindow.xaml.cs
View File

@@ -90,7 +90,7 @@ public partial class MainWindow : IDisposable
// Check for update
if (Settings.Default.CheckVersionAtStartup)
await UpdateCheck.CheckForUpdate();
await UpdateCheck.CheckForUpdate(Settings.Default.IncludePrerelease);
// Show the link if updates are available
if (UpdateCheck.UpdateAvailable)

2
Application/MainWindow/UpdateHandler.cs
View File

@@ -34,6 +34,6 @@ public partial class MainWindow
private void HandleNewVersionLinkClick(object sender, RoutedEventArgs e)
{
UpdateCheck.DisplayUpdateInformation(true);
UpdateCheck.DisplayUpdateInformation(true, Settings.Default.IncludePrerelease);
}
}