Skip to content

commit settings on losing focus/fix settings write deadlock bug [CPP-388] #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 25, 2021
Merged

commit settings on losing focus/fix settings write deadlock bug [CPP-388] #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
538696b
fix settings_write deadlock
notoriaga Oct 25, 2021
6f63d1c
save settings value when losing focus
notoriaga Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions console_backend/src/settings_tab.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,31 +301,30 @@ impl<'link, S: CapnProtoSender> SettingsTab<'link, S> {
}

fn write_setting(&self, group: &str, name: &str, value: &str) -> Result<()> {
let settings = self.settings.lock();
let setting = settings.get(group, name)?;
{
let mut settings = self.settings.lock();
let setting = settings.get(group, name)?;

if let Some(ref v) = setting.value {
if v.to_string() == value {
debug!("skipping write because setting has not changed");
return Ok(());
if let Some(ref v) = setting.value {
if v.to_string() == value {
debug!("skipping write because setting has not changed");
return Ok(());
}
}
}

self.sbp_client.write_setting(group, name, value)?;

if matches!(
setting.setting.kind,
SettingKind::Float | SettingKind::Double
) {
let new_setting = self
.sbp_client
.read_setting(group, name)
.ok_or_else(|| anyhow!("settting not found"))??;
self.settings.lock().set(group, name, new_setting)?;
} else {
self.settings
.lock()
.set(group, name, SettingValue::String(value.to_string()))?;
self.sbp_client.write_setting(group, name, value)?;
if matches!(
setting.setting.kind,
SettingKind::Float | SettingKind::Double
) {
let new_setting = self
.sbp_client
.read_setting(group, name)
.ok_or_else(|| anyhow!("settting not found"))??;
settings.set(group, name, new_setting)?;
} else {
settings.set(group, name, SettingValue::String(value.to_string()))?;
}
}

if group == "ins" && name == "output_mode" {
Expand Down
14 changes: 12 additions & 2 deletions resources/SettingsTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,22 @@ Item {
id: settingRowEditable

TextField {
id: textField

// these are properties because the selected row will have changed before
// the onDestruction event has triggered
property string settingGroup: selectedRowField("group")
property string settingName: selectedRowField("name")

text: selectedRowField(_fieldName)
wrapMode: Text.WordWrap
font.family: Constants.genericTable.fontFamily
font.pointSize: Constants.largePointSize
Keys.onReturnPressed: {
data_model.settings_write_request(selectedRowField("group"), selectedRowField("name"), text);
onEditingFinished: {
data_model.settings_write_request(settingGroup, settingName, text);
}
Component.onDestruction: {
data_model.settings_write_request(settingGroup, settingName, text);
}
}

Expand Down