Skip to content

Commit

Permalink
Fix proxy settings retrieval on startup (#18171)
Browse files Browse the repository at this point in the history
Closes #18155

Release Notes:

- N/A
  • Loading branch information
ClanEver authored Sep 24, 2024
1 parent 4a4d8c1 commit fd07fef
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions crates/zed/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ fn main() {
AppCommitSha::set_global(AppCommitSha(build_sha.into()), cx);
}
settings::init(cx);
handle_settings_file_changes(user_settings_file_rx, cx, handle_settings_changed);
handle_keymap_file_changes(user_keymap_file_rx, cx, handle_keymap_changed);
client::init_settings(cx);
let user_agent = format!(
"Zed/{} ({}; {})",
Expand Down Expand Up @@ -470,9 +472,6 @@ fn main() {

OpenListener::set_global(cx, open_listener.clone());

handle_settings_file_changes(user_settings_file_rx, cx, handle_settings_changed);
handle_keymap_file_changes(user_keymap_file_rx, cx, handle_keymap_changed);

let client = Client::production(cx);
cx.set_http_client(client.http_client().clone());
let mut languages = LanguageRegistry::new(cx.background_executor().clone());
Expand Down

0 comments on commit fd07fef

Please sign in to comment.