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

Fix ./script/bundle to allow passing key

Browse source
This commit is contained in:
Conrad Irwin 2023-10-09 08:59:25 -06:00
parent 34b7537948
commit 5dbda70235
5 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/workspace/src/workspace.rs
View file

@ -4162,7 +4162,6 @@ async fn join_channel_internal(
active_call: &ModelHandle<ActiveCall>,
cx: &mut AsyncAppContext,
) -> Result<bool> {
dbg!("join channel internal");
let should_prompt = active_call.read_with(cx, |active_call, cx| {
let Some(room) = active_call.room().map(|room| room.read(cx)) else {
return false;
@ -4195,7 +4194,6 @@ async fn join_channel_internal(
return Ok(false); // unreachable!() hopefully
}
}
dbg!("asdajdkjkasd");
let client = cx.read(|cx| active_call.read(cx).client());
@ -4221,8 +4219,6 @@ async fn join_channel_internal(
}
}
dbg!("past here");
let room = active_call
.update(cx, |active_call, cx| {
active_call.join_channel(channel_id, cx)
@ -4231,8 +4227,6 @@ async fn join_channel_internal(
room.update(cx, |room, _| room.next_room_update()).await;
dbg!("wow");
let task = room.update(cx, |room, cx| {
if let Some((project, host)) = room.most_active_project() {
return Some(join_remote_project(project, host, app_state.clone(), cx));
@ -4273,7 +4267,6 @@ pub fn join_channel(
&mut cx,
)
.await;
dbg!("joined!");
// join channel succeeded, and opened a window
if matches!(result, Ok(true)) {