From 96c5bb8c396d0ac9a5fd7a9962783502cce2eca9 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 7 Oct 2022 15:07:09 +0200
Subject: [PATCH] Fix flicker due to adding and removing menu bar extra
 unnecessarily

---
 crates/collab_ui/src/menu_bar_extra.rs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/crates/collab_ui/src/menu_bar_extra.rs b/crates/collab_ui/src/menu_bar_extra.rs
index 8b2baa53eb..814d51b189 100644
--- a/crates/collab_ui/src/menu_bar_extra.rs
+++ b/crates/collab_ui/src/menu_bar_extra.rs
@@ -16,13 +16,17 @@ pub fn init(cx: &mut MutableAppContext) {
 
     let mut status_bar_item_id = None;
     cx.observe(&ActiveCall::global(cx), move |call, cx| {
-        if let Some(status_bar_item_id) = status_bar_item_id.take() {
-            cx.remove_status_bar_item(status_bar_item_id);
-        }
+        let had_room = status_bar_item_id.is_some();
+        let has_room = call.read(cx).room().is_some();
+        if had_room != has_room {
+            if let Some(status_bar_item_id) = status_bar_item_id.take() {
+                cx.remove_status_bar_item(status_bar_item_id);
+            }
 
-        if call.read(cx).room().is_some() {
-            let (id, _) = cx.add_status_bar_item(|_| MenuBarExtra::new());
-            status_bar_item_id = Some(id);
+            if has_room {
+                let (id, _) = cx.add_status_bar_item(|_| MenuBarExtra::new());
+                status_bar_item_id = Some(id);
+            }
         }
     })
     .detach();
@@ -34,6 +38,12 @@ struct MenuBarExtra {
 
 impl Entity for MenuBarExtra {
     type Event = ();
+
+    fn release(&mut self, cx: &mut MutableAppContext) {
+        if let Some(popover) = self.popover.take() {
+            cx.remove_window(popover.window_id());
+        }
+    }
 }
 
 impl View for MenuBarExtra {