From 6f8d252dc6db61347f7af37d60909e76116ae070 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 24 Oct 2019 09:23:57 +1100 Subject: [PATCH 1/2] add prevention from double clicking disable in context menu --- Plugins/Wox.Plugin.Program/Main.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Plugins/Wox.Plugin.Program/Main.cs b/Plugins/Wox.Plugin.Program/Main.cs index e6bcc98687..a00607b43d 100644 --- a/Plugins/Wox.Plugin.Program/Main.cs +++ b/Plugins/Wox.Plugin.Program/Main.cs @@ -162,21 +162,24 @@ namespace Wox.Plugin.Program return menuOptions; } - private void DisableProgram(IProgram ProgramToDelete) + private void DisableProgram(IProgram programToDelete) { - if(_uwps.Any(x => x.UniqueIdentifier == ProgramToDelete.UniqueIdentifier)) - _uwps.Where(x => x.UniqueIdentifier == ProgramToDelete.UniqueIdentifier).FirstOrDefault().Enabled = false; + if (_settings.DisabledProgramSources.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)) + return; - if (_win32s.Any(x => x.UniqueIdentifier == ProgramToDelete.UniqueIdentifier)) - _win32s.Where(x => x.UniqueIdentifier == ProgramToDelete.UniqueIdentifier).FirstOrDefault().Enabled = false; + if (_uwps.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)) + _uwps.Where(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier).FirstOrDefault().Enabled = false; + + if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)) + _win32s.Where(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier).FirstOrDefault().Enabled = false; _settings.DisabledProgramSources .Add( new Settings.DisabledProgramSource { - Name = ProgramToDelete.Name, - Location = ProgramToDelete.Location, - UniqueIdentifier = ProgramToDelete.UniqueIdentifier, + Name = programToDelete.Name, + Location = programToDelete.Location, + UniqueIdentifier = programToDelete.UniqueIdentifier, Enabled = false } ); From e1064275a039794f91a630d94081322acd17392c Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Thu, 24 Oct 2019 09:27:27 +1100 Subject: [PATCH 2/2] Remove unused packages --- Plugins/Wox.Plugin.Program/Main.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Plugins/Wox.Plugin.Program/Main.cs b/Plugins/Wox.Plugin.Program/Main.cs index a00607b43d..0a6f37a4a0 100644 --- a/Plugins/Wox.Plugin.Program/Main.cs +++ b/Plugins/Wox.Plugin.Program/Main.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; using System.Windows.Controls; -using Wox.Infrastructure; using Wox.Infrastructure.Logger; using Wox.Infrastructure.Storage; using Wox.Plugin.Program.Programs;