From 4bd0b2fba1f4cea8e8761de743343ffce0d5a27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillem=20Sunyer=20Cald=C3=BA?= <gsunyercaldu@gmail.com>
Date: Sun, 27 Mar 2022 22:27:03 +0200
Subject: [PATCH] Current context issues

---
 Runtime/Ui/ViewStack/Instructions/HideInstruction.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Runtime/Ui/ViewStack/Instructions/HideInstruction.cs b/Runtime/Ui/ViewStack/Instructions/HideInstruction.cs
index d37ac35..7256dce 100644
--- a/Runtime/Ui/ViewStack/Instructions/HideInstruction.cs
+++ b/Runtime/Ui/ViewStack/Instructions/HideInstruction.cs
@@ -80,8 +80,6 @@ private void HandlePopup(IViewContext context)
 
             if (!pupupFound)
             {
-                UnityEngine.Debug.LogError($"Tried to Hide {entryId} as Popup, " +
-                    $"but it was not showing on the first place, at {nameof(HideInstruction)}");
                 return;
             }
 
@@ -90,7 +88,10 @@ private void HandlePopup(IViewContext context)
 
         private Task HandleNonPopup(IViewContext context, CancellationToken cancellationToken)
         {
-            currentContextRepository.Clear();
+            if (context.ViewId == entryId)
+            {
+                currentContextRepository.Clear();
+            }
 
             List<Task> hideTasks = new List<Task>();