diff --git a/CHANGELOG.md b/CHANGELOG.md index fe8dbe9b..acdf5608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ ### Changelog #### Version - 3.0.4.1 - TBD - * Fix recursive writing of meta files for meta files +* Improved Admin Check +* Improved naming of installation fields to clear up some confusion. #### Version - 3.0.4.0 - 11/12/2022 * Upgrade GameFinder to 2.2.1 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) { 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" />