Skip to content

Fix: Fixed crash that would occur when settings file was invalid #13853

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 3 commits into from
Nov 13, 2023
Merged

Fix: Fixed crash that would occur when settings file was invalid #13853

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e182d9
Fix: Fixed crash when settings file is invalid
yaira2 Nov 13, 2023
5b6b3f1
Update DefaultJsonSettingsDatabase.cs
yaira2 Nov 13, 2023
9463f71
Update DefaultJsonSettingsDatabase.cs
yaira2 Nov 13, 2023
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
11 changes: 10 additions & 1 deletion src/Files.App/Utils/Serialization/Implementation/DefaultJsonSettingsDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,16 @@ public DefaultJsonSettingsDatabase(ISettingsSerializer settingsSerializer, IJson
data = "null";
}

return JsonSettingsSerializer.DeserializeFromJson<ConcurrentDictionary<string, object?>?>(data) ?? new();
try
{
return JsonSettingsSerializer.DeserializeFromJson<ConcurrentDictionary<string, object?>?>(data) ?? new();
}
catch (Exception)
{
// Occurs if the settings file has invalid json
// TODO Display prompt to notify user #710
return JsonSettingsSerializer.DeserializeFromJson<ConcurrentDictionary<string, object?>?>("null") ?? new();
}
}

protected bool SaveSettings(IDictionary<string, object?> data)
Expand Down