Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source 
Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com>
This commit is contained in:
Shawn Yuan (from Dev Box)
2025-12-09 14:58:15 +08:00
parent 4a823320c4
commit debf4322df
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/settings-ui/Settings.UI/ViewModels/ShortcutConflictViewModel.cs
View File

@@ -244,6 +244,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
// Send IPC notification using the same format as other ViewModels
SendConfigMSG(settingsConfig, moduleName);
// Request updated conflicts after changing a hotkey
GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
}
}
catch (Exception ex)
@@ -264,11 +267,22 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
? JsonSerializer.Serialize(settingsConfig, jsonTypeInfo)
: JsonSerializer.Serialize(settingsConfig);
var ipcMessage = string.Format(
string ipcMessage;
if (string.Equals(moduleName, "GeneralSettings", StringComparison.OrdinalIgnoreCase))
{
ipcMessage = string.Format(
CultureInfo.InvariantCulture,
"{{ \"general\": {0} }}",
serializedSettings);
}
else
{
ipcMessage = string.Format(
CultureInfo.InvariantCulture,
"{{ \"powertoys\": {{ \"{0}\": {1} }} }}",
moduleName,
serializedSettings);
}
var result = _ipcMSGCallBackFunc(ipcMessage);
System.Diagnostics.Debug.WriteLine($"Sent IPC notification for {moduleName}, result: {result}");