mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 02:06:36 +02:00
Add telemetry for shortcut conflict detection feature. (#41271)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Add telemetry for shortcut conflict detection. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --------- Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com> Signed-off-by: Shuai Yuan <shuai.yuan.zju@gmail.com>
This commit is contained in:
@@ -29,7 +29,7 @@ using Windows.ApplicationModel.DataTransfer;
|
||||
|
||||
namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
{
|
||||
public partial class MouseWithoutBordersViewModel : PageViewModelBase, IDisposable
|
||||
public partial class MouseWithoutBordersViewModel : PageViewModelBase
|
||||
{
|
||||
protected override string ModuleName => MouseWithoutBordersSettings.ModuleName;
|
||||
|
||||
@@ -43,6 +43,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
|
||||
private readonly Lock _machineMatrixStringLock = new();
|
||||
|
||||
private bool _disposed;
|
||||
|
||||
private static readonly Dictionary<SocketStatus, Brush> StatusColors = new Dictionary<SocketStatus, Brush>()
|
||||
{
|
||||
{ SocketStatus.NA, new SolidColorBrush(ColorHelper.FromArgb(0, 0x71, 0x71, 0x71)) },
|
||||
@@ -1262,38 +1264,43 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
if (!_disposed)
|
||||
{
|
||||
// Cancel the cancellation token source
|
||||
_cancellationTokenSource?.Cancel();
|
||||
_cancellationTokenSource?.Dispose();
|
||||
if (disposing)
|
||||
{
|
||||
// Cancel the cancellation token source
|
||||
_cancellationTokenSource?.Cancel();
|
||||
_cancellationTokenSource?.Dispose();
|
||||
|
||||
// Wait for the machine polling task to complete
|
||||
try
|
||||
{
|
||||
_machinePollingThreadTask?.Wait(TimeSpan.FromSeconds(1));
|
||||
}
|
||||
catch (AggregateException)
|
||||
{
|
||||
// Task was cancelled, which is expected
|
||||
// Wait for the machine polling task to complete
|
||||
try
|
||||
{
|
||||
_machinePollingThreadTask?.Wait(TimeSpan.FromSeconds(1));
|
||||
}
|
||||
catch (AggregateException)
|
||||
{
|
||||
// Task was cancelled, which is expected
|
||||
}
|
||||
|
||||
// Dispose the named pipe stream
|
||||
try
|
||||
{
|
||||
syncHelperStream?.Dispose();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError($"Error disposing sync helper stream: {ex}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
syncHelperStream = null;
|
||||
}
|
||||
|
||||
// Dispose the semaphore
|
||||
_ipcSemaphore?.Dispose();
|
||||
}
|
||||
|
||||
// Dispose the named pipe stream
|
||||
try
|
||||
{
|
||||
syncHelperStream?.Dispose();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.LogError($"Error disposing sync helper stream: {ex}");
|
||||
}
|
||||
finally
|
||||
{
|
||||
syncHelperStream = null;
|
||||
}
|
||||
|
||||
// Dispose the semaphore
|
||||
_ipcSemaphore?.Dispose();
|
||||
_disposed = true;
|
||||
}
|
||||
|
||||
base.Dispose(disposing);
|
||||
|
||||
Reference in New Issue
Block a user