Merge pull request #5369 from jonathan-rizk/ExcludeDisabledHotkeys

MDoerner · web-flow · commit 2b17c422f810 · 2020-02-02T01:59:12.000+01:00
Hotkey Mod Label: Exclude Disabled Hotkeys
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
@@ -112,7 +112,7 @@ public bool ShouldDisplayHotkeyModificationLabel
         {
             get
             {
-                return _hotkeys.Any(s => !s.IsValid);
+                return _hotkeys.Any(s => !s.IsValid && s.IsEnabled);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public bool ShouldDisplayHotkeyModificationLabel`
`112`	`112`	`{`
`113`	`113`	`get`
`114`	`114`	`{`
`115`		`- return _hotkeys.Any(s => !s.IsValid);`
	`115`	`+ return _hotkeys.Any(s => !s.IsValid && s.IsEnabled);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`