Skip to content

Fix: Fixed ArgumentNullException in DefaultSettingsSerializer.ReadFromFile #15900

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 1 commit into from
Jul 30, 2024
Merged

Fix: Fixed ArgumentNullException in DefaultSettingsSerializer.ReadFromFile #15900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/Files.App/Services/Settings/FileTagsSettingsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ internal sealed class FileTagsSettingsService : BaseJsonSettings, IFileTagsSetti
public FileTagsSettingsService()
{
SettingsSerializer = new DefaultSettingsSerializer();
JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);

Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path,
Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.FileTagSettingsFileName));

JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
}

public IList<TagViewModel> FileTagList
Expand Down
5 changes: 3 additions & 2 deletions src/Files.App/Services/Settings/UserSettingsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ public IAppSettingsService AppSettingsService
public UserSettingsService()
{
SettingsSerializer = new DefaultSettingsSerializer();
JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);

Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.UserSettingsFileName));

JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
}

public override object ExportSettings()
Expand Down