Merge pull request #953 from Flow-Launcher/disableshellwinr

jjw24 · web-flow · commit de97cd4e5257 · 2022-01-10T20:11:13.000+11:00
stop trigger global hotkey when shell plugin is not enabled
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -317,7 +317,7 @@ public void Init(PluginInitContext context)
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
         {
-            if (_settings.ReplaceWinR)
+            if (!context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR)
             {
                 if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed)
                 {
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.8",
+  "Version": "1.4.9",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public void Init(PluginInitContext context)`
`317`	`317`
`318`	`318`	`bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)`
`319`	`319`	`{`
`320`		`- if (_settings.ReplaceWinR)`
	`320`	`+ if (!context.CurrentPluginMetadata.Disabled && _settings.ReplaceWinR)`
`321`	`321`	`{`
`322`	`322`	`if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed)`
`323`	`323`	`{`