prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Only restart from non-admin to admin & Fix restart as administrator issue

Browse source
This commit is contained in:
Jack251970 2025-05-23 11:14:15 +08:00
parent eae4a9584b
commit 52c36ff8d4
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/Languages/en.xaml
View file

@ -135,7 +135,7 @@
<system:String x:Key="alwaysRunAsAdministrator">Always run as administrator</system:String>
<system:String x:Key="alwaysRunAsAdministratorToolTip">Run Flow Launcher as administrator on system startup</system:String>
<system:String x:Key="runAsAdministratorChange">Administrator Mode Change</system:String>
<system:String x:Key="runAsAdministratorChangeAndRestart">Do you want to restart to apply administrator mode change?</system:String>
<system:String x:Key="runAsAdministratorChangeAndRestart">Do you want to restart as administrator to apply this change? Or you need to run as administrator during next start manually.</system:String>
<!-- Setting Plugin -->
<system:String x:Key="searchplugin">Search Plugin</system:String>

36
Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
View file

@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms;
using CommunityToolkit.Mvvm.Input;
@ -9,6 +11,7 @@ using Flow.Launcher.Core.Configuration;
using Flow.Launcher.Core.Resource;
using Flow.Launcher.Helper;
using Flow.Launcher.Infrastructure;
using Flow.Launcher.Infrastructure.Image;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
using Flow.Launcher.Plugin.SharedModels;
@ -75,7 +78,7 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
// even if we encounter an error while setting the startup method
if (value && UseLogonTaskForStartup)
{
CheckAdminChangeAndAskForRestart();
_ = CheckAdminChangeAndAskForRestartAsync();
}
}
}
@ -112,7 +115,7 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
// even if we encounter an error while setting the startup method
if (StartFlowLauncherOnSystemStartup && value)
{
CheckAdminChangeAndAskForRestart();
_ = CheckAdminChangeAndAskForRestartAsync();
}
}
}
@ -139,22 +142,41 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
// If we have enabled logon task startup, we need to check if we need to restart the app
// even if we encounter an error while setting the startup method
CheckAdminChangeAndAskForRestart();
_ = CheckAdminChangeAndAskForRestartAsync();
}
}
}
private void CheckAdminChangeAndAskForRestart()
private async Task CheckAdminChangeAndAskForRestartAsync()
{
if ((AlwaysRunAsAdministrator && !_isAdministrator) || // Change from non-admin to admin
(!AlwaysRunAsAdministrator && _isAdministrator)) // Change from admin to non-admin
// When we change from non-admin to admin, we need to restart the app as administrator to apply the changes
// Under non-administrator, we cannot delete or set the logon task which is run as administrator
if (AlwaysRunAsAdministrator && !_isAdministrator)
{
if (App.API.ShowMsgBox(
App.API.GetTranslation("runAsAdministratorChangeAndRestart"),
App.API.GetTranslation("runAsAdministratorChange"),
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
App.API.RestartApp(AlwaysRunAsAdministrator ? "runas" : string.Empty);
App.API.HideMainWindow();
// We must manually save because of Environment.Exit(0)
// which will cause ungraceful exit
App.API.SaveAppAllSettings();
// Wait for all image caches to be saved before restarting
await ImageLoader.WaitSaveAsync();
// Restart the app as administrator
var startInfo = new ProcessStartInfo
{
UseShellExecute = true,
WorkingDirectory = Environment.CurrentDirectory,
FileName = Constant.ExecutablePath,
Verb = "runas"
};
Process.Start(startInfo);
Environment.Exit(0);
}
}
}