From a97f676595e3bf8643a35589d5ad10d8a74c6ad7 Mon Sep 17 00:00:00 2001 From: erri120 Date: Sun, 13 Nov 2022 12:24:53 +0100 Subject: [PATCH 1/3] Improve admin check --- Wabbajack.App.Wpf/App.xaml.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Wabbajack.App.Wpf/App.xaml.cs b/Wabbajack.App.Wpf/App.xaml.cs index 60e839c5..a224e5d6 100644 --- a/Wabbajack.App.Wpf/App.xaml.cs +++ b/Wabbajack.App.Wpf/App.xaml.cs @@ -99,8 +99,12 @@ namespace Wabbajack try { var identity = WindowsIdentity.GetCurrent(); + var owner = identity.Owner; + if (owner is not null) return owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid); + var principle = new WindowsPrincipal(identity); return principle.IsInRole(WindowsBuiltInRole.Administrator); + } catch (Exception) { From 767dcb02908d07ebc41e37e7ca5fd1a86f0d4b6e Mon Sep 17 00:00:00 2001 From: EzioTheDeadPoet <52624146+EzioTheDeadPoet@users.noreply.github.com> Date: Mon, 14 Nov 2022 18:12:18 +0100 Subject: [PATCH 2/3] Rename Installation Fields To make it clear what they mean and require --- CHANGELOG.md | 4 ++++ .../Views/Installers/MO2InstallerConfigView.xaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73e6d639..d09f25c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Changelog +#### Version - 3.0.4.1 - TBD + +* Improved naming of installation fields to clear up some confusion. + #### Version - 3.0.4.0 - 11/12/2022 * Upgrade GameFinder to 2.2.1 * Update to .NET 7.0 (no user updates required) diff --git a/Wabbajack.App.Wpf/Views/Installers/MO2InstallerConfigView.xaml b/Wabbajack.App.Wpf/Views/Installers/MO2InstallerConfigView.xaml index e4a65555..cd1eb189 100644 --- a/Wabbajack.App.Wpf/Views/Installers/MO2InstallerConfigView.xaml +++ b/Wabbajack.App.Wpf/Views/Installers/MO2InstallerConfigView.xaml @@ -24,7 +24,7 @@ HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" - Text="Installation Location" + Text="Modlist Installation Location" TextAlignment="Center" /> Date: Mon, 14 Nov 2022 18:15:33 +0100 Subject: [PATCH 3/3] updated CHANGELOG.md in this branch to make tracking of changes for release notes easier --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73e6d639..11ddeb63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Changelog +#### Version - 3.0.4.1 - TBD + +* Improved Admin Check + #### Version - 3.0.4.0 - 11/12/2022 * Upgrade GameFinder to 2.2.1 * Update to .NET 7.0 (no user updates required)