Do not update action visibility if previous popup owner is null

brave · Dec 7, 2021 · f44142b · f44142b
1 parent e494247
commit f44142b
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/browser/ui/views/brave_actions/brave_actions_container.cc b/browser/ui/views/brave_actions/brave_actions_container.cc
@@ -449,13 +449,11 @@ void BraveActionsContainer::SetPopupOwner(
     DCHECK(!popup_owner_);
     popup_owner_ = popup_owner;
     UpdateActionVisibility(popup_owner->GetId());
-    return;
+  } else if (popup_owner_) {
+    auto* previous_owner = popup_owner_;
+    popup_owner_ = nullptr;
+    UpdateActionVisibility(previous_owner->GetId());
   }
-
-  auto* previous_owner = popup_owner_;
-  DCHECK(previous_owner);
-  popup_owner_ = nullptr;
-  UpdateActionVisibility(previous_owner->GetId());
 }
 
 void BraveActionsContainer::HideActivePopup() {