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

… reconfiguration.

SafeExamBrowser.Client/App.cs

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

SafeExamBrowser.Client/ClientController.cs

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