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

SEBWIN-312: Ensured applications which are allowed to be running are not automatically terminated.

Browse source
This commit is contained in:
dbuechel 2019-12-06 10:47:44 +01:00
parent 3626fbe74f
commit a18a404ed6
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Applications/ExternalApplication.cs
View file

@ -94,7 +94,7 @@ namespace SafeExamBrowser.Applications
lock (@lock) lock (@lock)
{ {
if (instances.Any()) if (instances.Any() && !settings.AllowRunning)
{ {
logger.Info("Terminating application..."); logger.Info("Terminating application...");

5
SafeExamBrowser.Configuration/ConfigurationData/DataMapper.Applications.cs
View file

@ -127,11 +127,6 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
application.OriginalName = originalName; application.OriginalName = originalName;
} }
if (applicationData.TryGetValue(Keys.Applications.RendererName, out v) && v is string rendererName)
{
application.RendererName = rendererName;
}
if (applicationData.TryGetValue(Keys.Applications.ShowInShell, out v) && v is bool showInShell) if (applicationData.TryGetValue(Keys.Applications.ShowInShell, out v) && v is bool showInShell)
{ {
application.ShowInShell = showInShell; application.ShowInShell = showInShell;

1
SafeExamBrowser.Configuration/ConfigurationData/Keys.cs
View file

@ -32,7 +32,6 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal const string ExecutablePath = "path"; internal const string ExecutablePath = "path";
internal const string OperatingSystem = "os"; internal const string OperatingSystem = "os";
internal const string OriginalName = "originalName"; internal const string OriginalName = "originalName";
internal const string RendererName = "windowHandlingProcess";
internal const string ShowInShell = "iconInTaskbar"; internal const string ShowInShell = "iconInTaskbar";
internal const string Whitelist = "permittedProcesses"; internal const string Whitelist = "permittedProcesses";
} }

7
SafeExamBrowser.Settings/Applications/WhitelistApplication.cs
View file

@ -53,7 +53,7 @@ namespace SafeExamBrowser.Settings.Applications
public string DisplayName { get; set; } public string DisplayName { get; set; }
/// <summary> /// <summary>
/// The name of the main executable of the application. /// The file name of the main executable of the application.
/// </summary> /// </summary>
public string ExecutableName { get; set; } public string ExecutableName { get; set; }
@ -72,11 +72,6 @@ namespace SafeExamBrowser.Settings.Applications
/// </summary> /// </summary>
public string OriginalName { get; set; } public string OriginalName { get; set; }
/// <summary>
/// The name of the executable responsible for rendering the user interface.
/// </summary>
public string RendererName { get; set; }
/// <summary> /// <summary>
/// Determines whether the user will be able to access the application via the shell. /// Determines whether the user will be able to access the application via the shell.
/// </summary> /// </summary>