zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-426: Ensured that lock screen is not activated when lock or switch session is allowed.

Browse source
This commit is contained in:
Damian Büchel 2020-10-23 09:31:23 +02:00
parent f6a3cb485b
commit 3ef3bccd7e
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
SafeExamBrowser.Client/ClientController.cs
View file

@ -590,30 +590,38 @@ namespace SafeExamBrowser.Client
private void SystemMonitor_SessionSwitched() private void SystemMonitor_SessionSwitched()
{ {
var allow = !Settings.Service.IgnoreService && (!Settings.Service.DisableUserLock || !Settings.Service.DisableUserSwitch);
var message = text.Get(TextKey.LockScreen_UserSessionMessage); var message = text.Get(TextKey.LockScreen_UserSessionMessage);
var title = text.Get(TextKey.LockScreen_Title); var title = text.Get(TextKey.LockScreen_Title);
var continueOption = new LockScreenOption { Text = text.Get(TextKey.LockScreen_UserSessionContinueOption) }; var continueOption = new LockScreenOption { Text = text.Get(TextKey.LockScreen_UserSessionContinueOption) };
var terminateOption = new LockScreenOption { Text = text.Get(TextKey.LockScreen_UserSessionTerminateOption) }; var terminateOption = new LockScreenOption { Text = text.Get(TextKey.LockScreen_UserSessionTerminateOption) };
logger.Warn("Detected user session switch!"); if (allow)
if (!sessionLocked)
{ {
sessionLocked = true; logger.Info("Detected user session switch, but user lock and/or user switch are allowed.");
var result = ShowLockScreen(message, title, new[] { continueOption, terminateOption });
if (result.OptionId == terminateOption.Id)
{
logger.Info("Attempting to shutdown as requested by the user...");
TryRequestShutdown();
}
sessionLocked = false;
} }
else else
{ {
logger.Info("Lock screen is already active."); logger.Warn("Detected user session switch!");
if (!sessionLocked)
{
sessionLocked = true;
var result = ShowLockScreen(message, title, new[] { continueOption, terminateOption });
if (result.OptionId == terminateOption.Id)
{
logger.Info("Attempting to shutdown as requested by the user...");
TryRequestShutdown();
}
sessionLocked = false;
}
else
{
logger.Info("Lock screen is already active.");
}
} }
} }