diff --git a/src/ui.rs b/src/ui.rs index 4a8ec99..29dbd88 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -1458,6 +1458,7 @@ fn load_group_config(ui: &QuickAccess) -> LoadedGroups { let snapshot = match ConfigProfileStore::default_store().and_then(|store| store.load_active()) { Ok(snapshot) => snapshot, Err(error) => { + diagnostics::log(Level::Error, "config", "load", None, error.to_string()); set_geometry_unconfigured(ui); ui.set_geometry_save_blocked(true); ui.set_geometry_error(error.to_string().into()); @@ -1512,11 +1513,9 @@ fn apply_config_reload( Ok(snapshot) => snapshot, Err(error) => { diagnostics::log(Level::Error, "config", "reload", None, error.to_string()); - surface_transient_error( - ui, - error_revision, - &format!("Couldn’t reload configuration: {error}"), - ); + ui.set_geometry_save_blocked(true); + ui.set_geometry_valid(false); + ui.set_geometry_error(error.to_string().into()); return false; } }; @@ -1582,10 +1581,6 @@ fn persist_groups( profile_revision: &Arc>, ) -> bool { if ui.get_geometry_save_blocked() { - surface_persistence_error( - ui, - "The saved configuration is invalid; reset or repair it before saving", - ); return false; } let validated = match validate_group_drafts(groups) { @@ -1604,6 +1599,9 @@ fn persist_validated_groups( active: usize, profile_revision: &Arc>, ) -> bool { + if ui.get_geometry_save_blocked() { + return false; + } let persisted = groups.iter().map(ValidatedGroupDraft::to_config).collect(); let Some(selected_group_id) = groups.get(active).map(ValidatedGroupDraft::id) else { surface_persistence_error(ui, "The selected mapping group no longer exists"); @@ -2462,6 +2460,62 @@ mod tests { restored.groups[0].sizing.unwrap().strategy, SizingStrategy::RoundedScale ); + + // A failed read must survive UI edits and hydration until a good reload. + // This child process uses a temporary LOCALAPPDATA, never the real profile. + let saved = std::fs::read(store.path()).unwrap(); + std::fs::write(store.path(), b"{").unwrap(); + let read_error = store.load_active().unwrap_err().to_string(); + let fallback = super::load_group_config(&ui); + assert_eq!(fallback.groups.len(), 1); + assert!(ui.get_geometry_save_blocked()); + assert!(!ui.get_geometry_valid()); + ui.invoke_geometry_edited(); + ui.invoke_save_geometry(); + ui.invoke_rendering_edited(); + super::hydrate_group( + &ui, + &tray, + &displays.lock().unwrap(), + &groups.lock().unwrap(), + *active.lock().unwrap(), + ); + assert_eq!(ui.get_geometry_error(), read_error.as_str()); + assert!(!ui.get_geometry_valid()); + // Invalid drafts must not replace the original read error with validation. + assert!(!super::persist_groups(&ui, &[], 0, &profile)); + assert!(!super::persist_validated_groups(&ui, &[], 0, &profile)); + assert_eq!(ui.get_geometry_error(), read_error.as_str()); + assert_eq!(std::fs::read(store.path()).unwrap(), b"{"); + let reload = || { + super::apply_config_reload( + &ui, + &tray, + &displays, + &groups, + &active, + &profile, + &error_revision, + ) + }; + ui.set_geometry_save_blocked(false); + ui.set_geometry_valid(true); + assert!(!reload()); + assert!(ui.get_geometry_save_blocked()); + assert!(!ui.get_geometry_valid()); + assert_eq!(ui.get_geometry_error(), read_error.as_str()); + std::fs::write(store.path(), saved).unwrap(); + assert!(reload()); + assert!(!ui.get_geometry_save_blocked()); + assert!(ui.get_geometry_error().is_empty()); + assert!(ui.get_geometry_valid()); + assert!(super::persist_groups( + &ui, + &groups.lock().unwrap(), + *active.lock().unwrap(), + &profile, + )); + // Only unfinished stream groups remain: the transitional seed must carry // the full manual settings even when there is no sizing mirror left. while groups diff --git a/src/ui/geometry_view.rs b/src/ui/geometry_view.rs index 787e5cd..6908d1f 100644 --- a/src/ui/geometry_view.rs +++ b/src/ui/geometry_view.rs @@ -1,6 +1,9 @@ use super::*; pub(super) fn update_geometry_preview(ui: &QuickAccess, displays: &[DisplayOption]) { + if ui.get_geometry_save_blocked() { + return; + } update_resolution_suggestions(ui); ui.set_geometry_error("".into()); ui.set_geometry_valid(false); @@ -148,6 +151,9 @@ pub(super) fn update_resolution_suggestions(ui: &QuickAccess) { } pub(super) fn calculate_geometry(ui: &QuickAccess, displays: &[DisplayOption]) { + if ui.get_geometry_save_blocked() { + return; + } update_geometry_preview(ui, displays); if !ui.get_geometry_valid() { if ui.get_page() != QuickAccessPage::Geometry && !ui.get_geometry_error().is_empty() { diff --git a/src/ui/handlers.rs b/src/ui/handlers.rs index be1497f..1d55e1b 100644 --- a/src/ui/handlers.rs +++ b/src/ui/handlers.rs @@ -57,6 +57,9 @@ pub(super) fn register_lifecycle_handlers( let start_state = state.clone(); flyout.on_start(move || { if let Some(ui) = flyout_weak.upgrade() { + if ui.get_geometry_save_blocked() { + return; + } let displays = start_state .displays .lock() @@ -102,7 +105,14 @@ pub(super) fn register_lifecycle_handlers( let stop_sender = sender.clone(); flyout.on_stop(move || stop_sender.stop()); let restart_sender = sender.clone(); - flyout.on_restart_mapping(move || restart_sender.restart_mapping()); + let flyout_weak = flyout.as_weak(); + flyout.on_restart_mapping(move || { + if let Some(ui) = flyout_weak.upgrade() + && !ui.get_geometry_save_blocked() + { + restart_sender.restart_mapping(); + } + }); let flyout_weak = flyout.as_weak(); let display_settings_error_revision = error_revision.clone(); diff --git a/src/ui/projection.rs b/src/ui/projection.rs index 727bd2d..c12f46e 100644 --- a/src/ui/projection.rs +++ b/src/ui/projection.rs @@ -183,7 +183,9 @@ pub(super) fn hydrate_group( } ui.set_sizing_strategy(sizing_strategy_index(group.sizing_strategy)); rebuild_reference_options(ui, displays, groups, group.reference_source.clone()); - if let Ok(request) = group_sizing_request(group, displays) { + if ui.get_geometry_save_blocked() { + ui.set_geometry_valid(false); + } else if let Ok(request) = group_sizing_request(group, displays) { match request.calculate() { Ok(result) => set_geometry_result(ui, result, true), Err(error) => { diff --git a/ui/quick-access.slint b/ui/quick-access.slint index aa5f161..c07b386 100644 --- a/ui/quick-access.slint +++ b/ui/quick-access.slint @@ -176,11 +176,11 @@ export component QuickAccess inherits Window { reference-action-enabled: root.reference-action-enabled; sizing-strategy <=> root.sizing-strategy; state: root.state; - state-detail: root.state-detail; + state-detail: root.geometry-save-blocked ? "Configuration unavailable" : root.state-detail; running: root.running; busy: root.busy; restart-available: root.restart-available; - error-text: root.error-text; + error-text: root.geometry-save-blocked ? root.geometry-error : root.error-text; mapping-fps: root.mapping-fps; mapping-fps-valid: root.mapping-fps-valid; mapping-fps-error: root.mapping-fps-error;