diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs index 5195cf09..4ef2f253 100644 --- a/Wabbajack/View Models/Installers/InstallerVM.cs +++ b/Wabbajack/View Models/Installers/InstallerVM.cs @@ -96,13 +96,13 @@ namespace Wabbajack public bool IsActive => _IsActive.Value; // Command properties - public IReactiveCommand ShowReportCommand { get; } - public IReactiveCommand OpenReadmeCommand { get; } - public IReactiveCommand VisitWebsiteCommand { get; } + public ReactiveCommand ShowReportCommand { get; } + public ReactiveCommand OpenReadmeCommand { get; } + public ReactiveCommand VisitWebsiteCommand { get; } public ReactiveCommand BackCommand { get; } - public IReactiveCommand CloseWhenCompleteCommand { get; } - public IReactiveCommand GoToInstallCommand { get; } - public IReactiveCommand BeginCommand { get; } + public ReactiveCommand CloseWhenCompleteCommand { get; } + public ReactiveCommand GoToInstallCommand { get; } + public ReactiveCommand BeginCommand { get; } public InstallerVM(MainWindowVM mainWindowVM) { @@ -324,7 +324,11 @@ namespace Wabbajack .Select(modList => !string.IsNullOrEmpty(modList?.Readme)) .ObserveOnGuiThread()); VisitWebsiteCommand = ReactiveCommand.Create( - execute: () => Process.Start(ModList.Website), + execute: () => + { + Process.Start(ModList.Website); + return Unit.Default; + }, canExecute: this.WhenAny(x => x.ModList.Website) .Select(x => x?.StartsWith("https://") ?? false) .ObserveOnGuiThread()); diff --git a/Wabbajack/Views/Installers/InstallationCompleteView.xaml b/Wabbajack/Views/Installers/InstallationCompleteView.xaml index 32d1e61c..a1e83306 100644 --- a/Wabbajack/Views/Installers/InstallationCompleteView.xaml +++ b/Wabbajack/Views/Installers/InstallationCompleteView.xaml @@ -1,4 +1,4 @@ - - + @@ -22,6 +24,7 @@ - - -