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

Fix proxy settings retrieval on startup (#18171)

Browse source 
Closes https://github.com/zed-industries/zed/issues/18155

Release Notes:

- N/A
This commit is contained in:
ClanEver 2024-09-25 00:27:29 +08:00 • committed by GitHub
parent 4a4d8c1cab
commit fd07fef4db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/zed/src/main.rs
View file

@ -443,6 +443,8 @@ fn main() {
AppCommitSha::set_global(AppCommitSha(build_sha.into()), cx); AppCommitSha::set_global(AppCommitSha(build_sha.into()), cx);
} }
settings::init(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); client::init_settings(cx);
let user_agent = format!( let user_agent = format!(
"Zed/{} ({}; {})", "Zed/{} ({}; {})",
@ -470,9 +472,6 @@ fn main() {
OpenListener::set_global(cx, open_listener.clone()); 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); let client = Client::production(cx);
cx.set_http_client(client.http_client().clone()); cx.set_http_client(client.http_client().clone());
let mut languages = LanguageRegistry::new(cx.background_executor().clone()); let mut languages = LanguageRegistry::new(cx.background_executor().clone());