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

SEBWIN-882, SEBWIN-904, #914: Ensured monitoring is terminated before reconfiguration.

Browse source
This commit is contained in:
Damian Büchel 2024-07-29 16:37:17 +02:00
parent 0b1746a82e
commit a1bfaadcd9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Client/App.cs
View file

@ -20,7 +20,7 @@ namespace SafeExamBrowser.Client
private const int ILMCM_LANGUAGEBAROFF = 0x00002; private const int ILMCM_LANGUAGEBAROFF = 0x00002;
private static readonly Mutex Mutex = new Mutex(true, AppConfig.CLIENT_MUTEX_NAME); private static readonly Mutex Mutex = new Mutex(true, AppConfig.CLIENT_MUTEX_NAME);
private CompositionRoot instances = new CompositionRoot(); private readonly CompositionRoot instances = new CompositionRoot();
[STAThread] [STAThread]
public static void Main() public static void Main()

12
SafeExamBrowser.Client/ClientController.cs
View file

@ -180,7 +180,6 @@ namespace SafeExamBrowser.Client
CloseShell(); CloseShell();
DeregisterEvents(); DeregisterEvents();
UpdateSessionIntegrity(); UpdateSessionIntegrity();
TerminateIntegrityVerification();
var success = operations.TryRevert() == OperationResult.Success; var success = operations.TryRevert() == OperationResult.Success;
@ -335,6 +334,7 @@ namespace SafeExamBrowser.Client
private void PrepareShutdown() private void PrepareShutdown()
{ {
FinalizeProctoring(); FinalizeProctoring();
StopMonitoring();
} }
private void FinalizeProctoring() private void FinalizeProctoring()
@ -388,6 +388,11 @@ namespace SafeExamBrowser.Client
} }
} }
private void StopMonitoring()
{
sentinel.StopMonitoring();
}
private void VerifyApplicationIntegrity() private void VerifyApplicationIntegrity()
{ {
logger.Info($"Attempting to verify application integrity..."); logger.Info($"Attempting to verify application integrity...");
@ -451,11 +456,6 @@ namespace SafeExamBrowser.Client
} }
} }
private void TerminateIntegrityVerification()
{
sentinel.StopMonitoring();
}
private void ApplicationMonitor_ExplorerStarted() private void ApplicationMonitor_ExplorerStarted()
{ {
logger.Info("Trying to terminate Windows explorer..."); logger.Info("Trying to terminate Windows explorer...");