mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 19:57:57 +01:00
CmdPal: Fix SUI crash ; Allow extensions to be disabled (#38040)
Both `TopLevelCommandItemWrapper` and `TopLevelViewModel` were really the same thing. The latter was from an earlier prototype, and the former is a more correct, safer abstraction. We really should have only ever used the former, but alas, we only used it for the SUI, and it piggy-backed off the latter, and that meant the latter's bugs became the former's. tldr: I made the icon access safe in the SUI. And while I was doing this, because we now have a cleaner VM abstraction here in the host, we can actually cleanly disable extensions, because the `CommandProviderWrapper` knows which `ViewModel`s it made. Closes https://github.com/zadjii-msft/PowerToys/issues/426 Closes https://github.com/zadjii-msft/PowerToys/issues/478 Closes https://github.com/zadjii-msft/PowerToys/issues/577
This commit is contained in:
@@ -95,18 +95,7 @@ public partial class SettingsViewModel
|
||||
|
||||
foreach (var item in activeProviders)
|
||||
{
|
||||
if (!allProviderSettings.TryGetValue(item.ProviderId, out var value))
|
||||
{
|
||||
allProviderSettings[item.ProviderId] = new ProviderSettings(item);
|
||||
}
|
||||
else
|
||||
{
|
||||
value.Connect(item);
|
||||
}
|
||||
|
||||
var providerSettings = allProviderSettings.TryGetValue(item.ProviderId, out var value2) ?
|
||||
value2 :
|
||||
new ProviderSettings(item);
|
||||
var providerSettings = settings.GetProviderSettings(item);
|
||||
|
||||
var settingsModel = new ProviderSettingsViewModel(item, providerSettings, _serviceProvider);
|
||||
CommandProviders.Add(settingsModel);
|
||||
|
||||
Reference in New Issue
Block a user