Fix Presenter leak when removing windows
This commit is contained in:
@@ -101,11 +101,15 @@ impl ChatPanel {
|
||||
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();
|
||||
async move {
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -852,6 +852,7 @@ impl MutableAppContext {
|
||||
pub fn remove_all_windows(&mut self) {
|
||||
for (window_id, _) in self.cx.windows.drain() {
|
||||
self.presenters_and_platform_windows.remove(&window_id);
|
||||
self.debug_elements_callbacks.remove(&window_id);
|
||||
}
|
||||
self.flush_effects();
|
||||
}
|
||||
@@ -1403,6 +1404,7 @@ impl MutableAppContext {
|
||||
pub fn remove_window(&mut self, window_id: usize) {
|
||||
self.cx.windows.remove(&window_id);
|
||||
self.presenters_and_platform_windows.remove(&window_id);
|
||||
self.debug_elements_callbacks.remove(&window_id);
|
||||
self.flush_effects();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user