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

SEBWIN-312: Ensured already known application instances are not initialized twice.

Browse source
This commit is contained in:
dbuechel 2019-12-02 17:00:55 +01:00
parent f1fc27e451
commit d8a27e9298
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
SafeExamBrowser.Applications/ExternalApplication.cs
View file

@ -108,10 +108,15 @@ namespace SafeExamBrowser.Applications
private void ApplicationMonitor_InstanceStarted(Guid applicationId, IProcess process) private void ApplicationMonitor_InstanceStarted(Guid applicationId, IProcess process)
{ {
if (applicationId == Id) lock (@lock)
{ {
logger.Info("New application instance was started."); var isNewInstance = instances.All(i => i.Id != process.Id);
InitializeInstance(process);
if (applicationId == Id && isNewInstance)
{
logger.Info("New application instance was started.");
InitializeInstance(process);
}
} }
} }
@ -127,15 +132,15 @@ namespace SafeExamBrowser.Applications
private void InitializeInstance(IProcess process) private void InitializeInstance(IProcess process)
{ {
var instanceLogger = logger.CloneFor($"{Name} ({process.Id})");
var instance = new ExternalApplicationInstance(Icon, instanceLogger, nativeMethods, process);
instance.Terminated += Instance_Terminated;
instance.WindowsChanged += () => WindowsChanged?.Invoke();
instance.Initialize();
lock (@lock) lock (@lock)
{ {
var instanceLogger = logger.CloneFor($"{Name} ({process.Id})");
var instance = new ExternalApplicationInstance(Icon, instanceLogger, nativeMethods, process);
instance.Terminated += Instance_Terminated;
instance.WindowsChanged += () => WindowsChanged?.Invoke();
instance.Initialize();
instances.Add(instance); instances.Add(instance);
} }
} }