Cargo.lock 🔗
@@ -17777,6 +17777,7 @@ dependencies = [
"recent_projects",
"release_channel",
"remote",
+ "remote_connection",
"rpc",
"schemars",
"semver",
Finn Evers created
This check was initially added in
https://github.com/zed-industries/zed/pull/19885/changes but has
regressed since. Making it explicit here again to stop this from
happening.
Release Notes:
- N/A
Cargo.lock | 1 +
crates/title_bar/Cargo.toml | 1 +
crates/title_bar/src/collab.rs | 7 ++++++-
3 files changed, 8 insertions(+), 1 deletion(-)
@@ -17777,6 +17777,7 @@ dependencies = [
"recent_projects",
"release_channel",
"remote",
+ "remote_connection",
"rpc",
"schemars",
"semver",
@@ -47,6 +47,7 @@ notifications.workspace = true
project.workspace = true
recent_projects.workspace = true
remote.workspace = true
+remote_connection.workspace = true
rpc.workspace = true
semver.workspace = true
schemars.workspace = true
@@ -12,6 +12,7 @@ use gpui::{App, Task, Window};
use icons::IconName;
use livekit_client::ConnectionQuality;
use project::WorktreeSettings;
+use remote_connection::RemoteConnectionModal;
use rpc::proto::{self};
use settings::{Settings as _, SettingsLocation};
use theme::ActiveTheme;
@@ -342,7 +343,11 @@ impl TitleBar {
let is_connecting_to_project = self
.workspace
- .update(cx, |workspace, cx| workspace.has_active_modal(window, cx))
+ .update(cx, |workspace, cx| {
+ workspace
+ .active_modal::<RemoteConnectionModal>(cx)
+ .is_some()
+ })
.unwrap_or(false);
let room = room.read(cx);