move showalert after saveprefs
This commit is contained in:
@@ -892,14 +892,13 @@ void UITask::toggleGPS() {
|
|||||||
_sensors->setSettingValue("gps", "0");
|
_sensors->setSettingValue("gps", "0");
|
||||||
_node_prefs->gps_enabled = 0;
|
_node_prefs->gps_enabled = 0;
|
||||||
notify(UIEventType::ack);
|
notify(UIEventType::ack);
|
||||||
showAlert("GPS: Disabled", 800);
|
|
||||||
} else {
|
} else {
|
||||||
_sensors->setSettingValue("gps", "1");
|
_sensors->setSettingValue("gps", "1");
|
||||||
_node_prefs->gps_enabled = 1;
|
_node_prefs->gps_enabled = 1;
|
||||||
notify(UIEventType::ack);
|
notify(UIEventType::ack);
|
||||||
showAlert("GPS: Enabled", 800);
|
|
||||||
}
|
}
|
||||||
the_mesh.savePrefs();
|
the_mesh.savePrefs();
|
||||||
|
showAlert(_node_prefs->gps_enabled ? "GPS: Enabled" : "GPS: Disabled", 800);
|
||||||
_next_refresh = 0;
|
_next_refresh = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -913,13 +912,12 @@ void UITask::toggleBuzzer() {
|
|||||||
if (buzzer.isQuiet()) {
|
if (buzzer.isQuiet()) {
|
||||||
buzzer.quiet(false);
|
buzzer.quiet(false);
|
||||||
notify(UIEventType::ack);
|
notify(UIEventType::ack);
|
||||||
showAlert("Buzzer: ON", 800);
|
|
||||||
} else {
|
} else {
|
||||||
buzzer.quiet(true);
|
buzzer.quiet(true);
|
||||||
showAlert("Buzzer: OFF", 800);
|
|
||||||
}
|
}
|
||||||
_node_prefs->buzzer_quiet = buzzer.isQuiet();
|
_node_prefs->buzzer_quiet = buzzer.isQuiet();
|
||||||
the_mesh.savePrefs();
|
the_mesh.savePrefs();
|
||||||
|
showAlert(buzzer.isQuiet() ? "Buzzer: OFF" : "Buzzer: ON", 800);
|
||||||
_next_refresh = 0; // trigger refresh
|
_next_refresh = 0; // trigger refresh
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user