Fix server settings (#38477)
In the settings refactor I'd assumed server settings were like project settings. This is not the case, they are in fact the normal user settings; but just read from the server. Release Notes: - N/A
This commit is contained in:
@@ -770,12 +770,9 @@ impl SettingsObserver {
|
||||
envelope: TypedEnvelope<proto::UpdateUserSettings>,
|
||||
cx: AsyncApp,
|
||||
) -> anyhow::Result<()> {
|
||||
let new_settings = serde_json::from_str(&envelope.payload.contents).with_context(|| {
|
||||
format!("deserializing {} user settings", envelope.payload.contents)
|
||||
})?;
|
||||
cx.update_global(|settings_store: &mut SettingsStore, cx| {
|
||||
settings_store
|
||||
.set_raw_user_settings(new_settings, cx)
|
||||
.set_user_settings(&envelope.payload.contents, cx)
|
||||
.context("setting new user settings")?;
|
||||
anyhow::Ok(())
|
||||
})??;
|
||||
|
||||
Reference in New Issue
Block a user