maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[FindMyMouse]Fix duplicated settings path (#14584)

Browse source
This commit is contained in:
Jaime Bernardo 2021-11-23 10:19:26 +00:00 committed by GitHub
parent 2d5276f742
commit 641d838140
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/FindMyMouseSettings.cs
View file

@ -9,7 +9,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
{
public class FindMyMouseSettings : BasePTModuleSettings, ISettingsConfig
{
public const string ModuleName = "Find My Mouse";
public const string ModuleName = "FindMyMouse";
[JsonPropertyName("properties")]
public FindMyMouseProperties Properties { get; set; }

18
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/MouseUtilsPage.xaml.cs
View file

@ -14,6 +14,24 @@ namespace Microsoft.PowerToys.Settings.UI.Views
public MouseUtilsPage()
{
try
{
// By mistake, the first release of Find My Mouse was saving settings in two places at the same time.
// Delete the wrong path for Find My Mouse settings.
var tempSettingsUtils = new SettingsUtils();
if (tempSettingsUtils.SettingsExists("Find My Mouse"))
{
var settingsFilePath = tempSettingsUtils.GetSettingsFilePath("Find My Mouse");
System.IO.File.Delete(settingsFilePath);
tempSettingsUtils.DeleteSettings("Find My Mouse");
}
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (System.Exception)
#pragma warning restore CA1031 // Do not catch general exception types
{
}
var settingsUtils = new SettingsUtils();
ViewModel = new MouseUtilsViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<FindMyMouseSettings>.GetInstance(settingsUtils), SettingsRepository<MouseHighlighterSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
DataContext = ViewModel;