Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Presenter leak when removing windows

Browse source
This commit is contained in:
Antonio Scandurra 2022-03-01 18:50:05 +01:00
parent c661ff251d
commit bc9c034baa
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/chat_panel/src/chat_panel.rs
View file

@ -101,11 +101,15 @@ impl ChatPanel {
cx.dispatch_action(LoadMoreMessages); cx.dispatch_action(LoadMoreMessages);
} }
}); });
let _observe_status = cx.spawn(|this, mut cx| { let _observe_status = cx.spawn_weak(|this, mut cx| {
let mut status = rpc.status(); let mut status = rpc.status();
async move { async move {
while let Some(_) = status.recv().await { while let Some(_) = status.recv().await {
this.update(&mut cx, |_, cx| cx.notify()); if let Some(this) = this.upgrade(&cx) {
this.update(&mut cx, |_, cx| cx.notify());
} else {
break;
}
} }
} }
}); });

2
crates/gpui/src/app.rs
View file

@ -852,6 +852,7 @@ impl MutableAppContext {
pub fn remove_all_windows(&mut self) { pub fn remove_all_windows(&mut self) {
for (window_id, _) in self.cx.windows.drain() { for (window_id, _) in self.cx.windows.drain() {
self.presenters_and_platform_windows.remove(&window_id); self.presenters_and_platform_windows.remove(&window_id);
self.debug_elements_callbacks.remove(&window_id);
} }
self.flush_effects(); self.flush_effects();
} }
@ -1403,6 +1404,7 @@ impl MutableAppContext {
pub fn remove_window(&mut self, window_id: usize) { pub fn remove_window(&mut self, window_id: usize) {
self.cx.windows.remove(&window_id); self.cx.windows.remove(&window_id);
self.presenters_and_platform_windows.remove(&window_id); self.presenters_and_platform_windows.remove(&window_id);
self.debug_elements_callbacks.remove(&window_id);
self.flush_effects(); self.flush_effects();
} }