Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix_writing_metas_task

Browse Source
This commit is contained in:
Timothy Baldridge 2022-11-17 06:40:53 -07:00 committed by GitHub
commit bdec4d2941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,8 +1,9 @@
### Changelog ### Changelog
#### Version - 3.0.4.1 - TBD #### Version - 3.0.4.1 - TBD
* Fix recursive writing of meta files for meta files * 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 #### Version - 3.0.4.0 - 11/12/2022
* Upgrade GameFinder to 2.2.1 * Upgrade GameFinder to 2.2.1

4
Wabbajack.App.Wpf/App.xaml.cs
View File

@ -99,8 +99,12 @@ namespace Wabbajack
try try
{ {
var identity = WindowsIdentity.GetCurrent(); var identity = WindowsIdentity.GetCurrent();
var owner = identity.Owner;
if (owner is not null) return owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid);
var principle = new WindowsPrincipal(identity); var principle = new WindowsPrincipal(identity);
return principle.IsInRole(WindowsBuiltInRole.Administrator); return principle.IsInRole(WindowsBuiltInRole.Administrator);
} }
catch (Exception) catch (Exception)
{ {

4
Wabbajack.App.Wpf/Views/Installers/MO2InstallerConfigView.xaml
View File

@ -24,7 +24,7 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
Text="Installation Location" Text="Modlist Installation Location"
TextAlignment="Center" /> TextAlignment="Center" />
<local:FilePicker Grid.Row="0" Grid.Column="2" <local:FilePicker Grid.Row="0" Grid.Column="2"
Height="30" Height="30"
@ -35,7 +35,7 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
Text="Download Location" Text="Resource Download Location"
TextAlignment="Center" /> TextAlignment="Center" />
<local:FilePicker Grid.Row="1" Grid.Column="2" <local:FilePicker Grid.Row="1" Grid.Column="2"
Height="30" Height="30"