fix app options

This commit is contained in:
DismissedLight
2023-03-15 20:13:24 +08:00
parent f21d04fadc
commit 1d88360528
6 changed files with 6 additions and 10 deletions

View File

@@ -1,13 +1,13 @@
// Copyright (c) DGP Studio. All rights reserved. // Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license. // Licensed under the MIT license.
using Snap.Hutao.Model.Binding.Hutao;
using Snap.Hutao.Model.Calculable; using Snap.Hutao.Model.Calculable;
using Snap.Hutao.Model.Metadata.Abstraction; using Snap.Hutao.Model.Metadata.Abstraction;
using Snap.Hutao.Model.Metadata.Converter; using Snap.Hutao.Model.Metadata.Converter;
using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.Model.Metadata.Item;
using Snap.Hutao.ViewModel.Complex; using Snap.Hutao.ViewModel.Complex;
using Snap.Hutao.ViewModel.GachaLog; using Snap.Hutao.ViewModel.GachaLog;
using Snap.Hutao.ViewModel.Wiki;
namespace Snap.Hutao.Model.Metadata.Avatar; namespace Snap.Hutao.Model.Metadata.Avatar;

View File

@@ -186,7 +186,7 @@ internal sealed class AppOptions : ObservableObject, IOptions<AppOptions>
{ {
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>(); AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
string? value = appDbContext.Settings.SingleOrDefault(e => e.Key == SettingEntry.IsAdvancedLaunchOptionsEnabled)?.Value; string? value = appDbContext.Settings.SingleOrDefault(e => e.Key == SettingEntry.IsAdvancedLaunchOptionsEnabled)?.Value;
_ = Activation.GetElevated() == true ? isAdvancedLaunchOptionsEnabled = value != null && bool.Parse(value) : IsAdvancedLaunchOptionsEnabled = false; isAdvancedLaunchOptionsEnabled = value != null && bool.Parse(value);
} }
} }

View File

@@ -301,16 +301,16 @@ internal sealed class GameService : IGameService
try try
{ {
Interlocked.Increment(ref runningGamesCounter); Interlocked.Increment(ref runningGamesCounter);
bool isPassCheck = Activation.GetElevated() == appOptions.IsAdvancedLaunchOptionsEnabled ? true : false;
game.Start(); game.Start();
if (isPassCheck && launchOptions.MultipleInstances) bool isAdvancedOptionsAllowed = Activation.GetElevated() && appOptions.IsAdvancedLaunchOptionsEnabled;
if (isAdvancedOptionsAllowed && launchOptions.MultipleInstances)
{ {
ProcessInterop.DisableProtection(game, gamePath); ProcessInterop.DisableProtection(game, gamePath);
} }
if (isPassCheck && launchOptions.UnlockFps) if (isAdvancedOptionsAllowed && launchOptions.UnlockFps)
{ {
await ProcessInterop.UnlockFpsAsync(game, launchOptions).ConfigureAwait(false); await ProcessInterop.UnlockFpsAsync(game, launchOptions).ConfigureAwait(false);
} }

View File

@@ -530,7 +530,4 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Model\Binding\BaseValue\" />
</ItemGroup>
</Project> </Project>

View File

@@ -5,7 +5,7 @@ using Snap.Hutao.Model.Metadata.Avatar;
using Snap.Hutao.Model.Metadata.Item; using Snap.Hutao.Model.Metadata.Item;
using Snap.Hutao.Model.Primitive; using Snap.Hutao.Model.Primitive;
namespace Snap.Hutao.Model.Binding.Hutao; namespace Snap.Hutao.ViewModel.Wiki;
/// <summary> /// <summary>
/// 料理奖励视图 /// 料理奖励视图

View File

@@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.WinUI.UI; using CommunityToolkit.WinUI.UI;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Primitives; using Microsoft.Extensions.Primitives;
using Snap.Hutao.Model.Binding.Hutao;
using Snap.Hutao.Model.Entity.Primitive; using Snap.Hutao.Model.Entity.Primitive;
using Snap.Hutao.Model.Intrinsic; using Snap.Hutao.Model.Intrinsic;
using Snap.Hutao.Model.Intrinsic.Immutable; using Snap.Hutao.Model.Intrinsic.Immutable;