From beb44945349d68278b5a6405d3e2cf526ccafe65 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Fri, 24 Jul 2020 11:35:03 -0700 Subject: [PATCH] Adding back in key for FZ Json (#5210) * Adding back in key for FZ Json * defaulting key to string empty Co-authored-by: Clint Rutkas --- .../Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs index c76d52eb2d..6d5dee93a6 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs +++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs @@ -56,6 +56,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib [JsonPropertyName("code")] public int Code { get; set; } + // This is currently needed for FancyZones, we need to unify these two objects + // see src\common\settings_objects.h + [JsonPropertyName("key")] + public string Key { get; set; } = string.Empty; + public override string ToString() { StringBuilder output = new StringBuilder();