From 27292ef4a3e498ff45f8904bb2e349581542eae4 Mon Sep 17 00:00:00 2001
From: terabyte25 <2564993-terrabyte25@users.noreply.gitlab.com>
Date: Fri, 12 Apr 2019 13:08:55 +0000
Subject: [PATCH] Disable quick keys when fighting and spellcasting are
 disabled (bug #4962)

---
 CHANGELOG.md                            | 1 +
 apps/openmw/mwinput/inputmanagerimp.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 104c02d6a..ec3fe41ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
     Bug #4963: Enchant skill progress is incorrect
     Bug #4965: Global light attenuation settings setup is lacking
     Bug #4969: "Miss" sound plays for any actor
+    Bug #4972: Player is able to use quickkeys while disableplayerfighting is active
     Feature #2229: Improve pathfinding AI
     Feature #3442: Default values for fallbacks from ini file
     Feature #3610: Option to invert X axis
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 24e82ba73..151d4add2 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1333,7 +1333,7 @@ namespace MWInput
 
     void InputManager::quickKey (int index)
     {
-        if (!mControlSwitch["playercontrols"])
+        if (!mControlSwitch["playercontrols"] || !mControlSwitch["playerfighting"] || !mControlSwitch["playermagic"])
             return;
         if (!checkAllowedToUseItems())
             return;