diff --git a/src/GIMI-ModManager.WinUI/ViewModels/ModUpdateVM.cs b/src/GIMI-ModManager.WinUI/ViewModels/ModUpdateVM.cs index 61f7217e..ab70a701 100644 --- a/src/GIMI-ModManager.WinUI/ViewModels/ModUpdateVM.cs +++ b/src/GIMI-ModManager.WinUI/ViewModels/ModUpdateVM.cs @@ -30,6 +30,8 @@ public partial class ModUpdateVM : ObservableRecipient [ObservableProperty] private DateTime _lastUpdateCheck = DateTime.Now; + [ObservableProperty] private bool _isOpenDownloadButtonEnabled = false; + public ObservableCollection Results = new(); private readonly ILogger _logger = App.GetService().ForContext(); diff --git a/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml b/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml index 8c59243c..1285eb81 100644 --- a/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml +++ b/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml @@ -170,7 +170,8 @@ Grid.Column="1" Margin="8,0" Click="ButtonBase_OnClick" - Content="Downloads" /> + Content="Downloads" + IsEnabled="{x:Bind ViewModel.IsOpenDownloadButtonEnabled, Mode=OneWay}" /> { ModPageLoadingRing.IsActive = false; + ViewModel.IsOpenDownloadButtonEnabled = true; // This automatically opens the author side pane // However, it covered the update date and was annoying so I disabled it diff --git a/src/JASM.AutoUpdater/MainPageVM.cs b/src/JASM.AutoUpdater/MainPageVM.cs index c9b2af10..82a72db8 100644 --- a/src/JASM.AutoUpdater/MainPageVM.cs +++ b/src/JASM.AutoUpdater/MainPageVM.cs @@ -340,6 +340,18 @@ private async Task InstallLatestVersion() continue; } + if (fileSystemInfo.Name.Equals("JASM - Just Another Skin Manager.exe.WebView2", + StringComparison.OrdinalIgnoreCase)) + { + continue; + } + + if (fileSystemInfo.Name.Equals("logs", + StringComparison.OrdinalIgnoreCase)) + { + continue; + } + if (fileSystemInfo is DirectoryInfo directoryInfo) directoryInfo.Delete(true); else