zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 02:17:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a circular reference between Client and UserStore

Browse Source 
Before this change once the UserStore had been created, the Client would
never be dropped.
This commit is contained in:
Conrad Irwin 2024-01-22 21:59:48 -07:00
parent 0b1b758f02
commit 34efb23bf6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/client/src/user.rs
View File

@ -146,7 +146,13 @@ impl UserStore {
}),
_maintain_current_user: cx.spawn(|this, mut cx| async move {
let mut status = client.status();
let weak = Arc::downgrade(&client);
drop(client);
while let Some(status) = status.next().await {
// if the client is dropped, the app is shutting down.
let Some(client) = weak.upgrade() else {
return Ok(());
};
match status {
Status::Connected { .. } => {
if let Some(user_id) = client.user_id() {