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

[PTRun]Fix crash when plugins have the same name (#15456)

Browse Source
This commit is contained in:
Jaime Bernardo
2022-01-11 23:12:00 +00:00
committed by GitHub
parent d52037fd5e
commit 1a9473c896
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/launcher/PowerLauncher.Telemetry/Events/PluginModel.cs
View File

@@ -9,6 +9,10 @@ namespace PowerLauncher.Telemetry.Events
[EventData] [EventData]
public class PluginModel public class PluginModel
{ {
public string ID { get; set; }
public string Name { get; set; }
public bool Disabled { get; set; } public bool Disabled { get; set; }
public bool IsGlobal { get; set; } public bool IsGlobal { get; set; }

27
src/modules/launcher/PowerLauncher/MainWindow.xaml.cs
View File

@@ -52,16 +52,27 @@ namespace PowerLauncher
private void SendSettingsTelemetry() private void SendSettingsTelemetry()
{ {
Log.Info("Send Run settings telemetry", this.GetType()); try
var plugins = PluginManager.AllPlugins.ToDictionary(x => x.Metadata.Name, x => new PluginModel()
{ {
Disabled = x.Metadata.Disabled, Log.Info("Send Run settings telemetry", this.GetType());
ActionKeyword = x.Metadata.ActionKeyword, var plugins = PluginManager.AllPlugins.ToDictionary(x => x.Metadata.Name + " " + x.Metadata.ID, x => new PluginModel()
IsGlobal = x.Metadata.IsGlobal, {
}); ID = x.Metadata.ID,
Name = x.Metadata.Name,
Disabled = x.Metadata.Disabled,
ActionKeyword = x.Metadata.ActionKeyword,
IsGlobal = x.Metadata.IsGlobal,
});
var telemetryEvent = new RunPluginsSettingsEvent(plugins); var telemetryEvent = new RunPluginsSettingsEvent(plugins);
PowerToysTelemetry.Log.WriteEvent(telemetryEvent); PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
#pragma warning restore CA1031 // Do not catch general exception types
{
Log.Exception("Unhandled exception when trying to send PowerToys Run settings telemetry.", ex, GetType());
}
} }
protected override void OnSourceInitialized(EventArgs e) protected override void OnSourceInitialized(EventArgs e)