From ecc544899714d54e78cd30301044db632ef6f112 Mon Sep 17 00:00:00 2001
From: Miguel Serra <m.rodrigues@mindbus.nl>
Date: Mon, 20 Nov 2023 18:07:33 +0000
Subject: [PATCH] Filter EndUpdate event subscriptions for the same Session

---
 .../Components/Applications/ApplicationBaseViewModel.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/COMET.Web.Common/ViewModels/Components/Applications/ApplicationBaseViewModel.cs b/COMET.Web.Common/ViewModels/Components/Applications/ApplicationBaseViewModel.cs
index 2929e485..aae92f39 100644
--- a/COMET.Web.Common/ViewModels/Components/Applications/ApplicationBaseViewModel.cs
+++ b/COMET.Web.Common/ViewModels/Components/Applications/ApplicationBaseViewModel.cs
@@ -2,7 +2,7 @@
 //  <copyright file="ApplicationBaseViewModel.cs" company="RHEA System S.A.">
 //    Copyright (c) 2023 RHEA System S.A.
 // 
-//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, Miguel Serra
 // 
 //    This file is part of COMET WEB Community Edition
 //    The COMET WEB Community Edition is the RHEA Web Application implementation of ECSS-E-TM-10-25
@@ -53,7 +53,7 @@ public abstract class ApplicationBaseViewModel : HaveObjectChangedTracking, IApp
         protected ApplicationBaseViewModel(ISessionService sessionService)
         {
             this.Disposables.Add(CDPMessageBus.Current.Listen<SessionEvent>()
-                .Where(x => x.Status == SessionStatus.EndUpdate)
+                .Where(x => x.Session == this.SessionService.Session && x.Status == SessionStatus.EndUpdate)
                 .SubscribeAsync(_ => this.OnSessionRefreshed()));
 
             this.SessionService = sessionService;