From ac070deb5cd0e9a8a199fe5638f1f81a1cfe59dc Mon Sep 17 00:00:00 2001
From: Steve Streeting <steve@stevestreeting.com>
Date: Tue, 21 Jun 2022 13:03:25 +0100
Subject: [PATCH] Fix InputImage not being updated when keyboard is preferred
 over mouse but no keyboard mapping

---
 Source/StevesUEHelpers/Private/StevesUI/StevesUI.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/StevesUEHelpers/Private/StevesUI/StevesUI.h b/Source/StevesUEHelpers/Private/StevesUI/StevesUI.h
index de0b41a..4b8aaee 100644
--- a/Source/StevesUEHelpers/Private/StevesUI/StevesUI.h
+++ b/Source/StevesUEHelpers/Private/StevesUI/StevesUI.h
@@ -77,11 +77,11 @@ const T* GetPreferedActionOrAxisMapping(const TArray<T>& AllMappings, const FNam
 
         case EInputImageDevicePreference::Gamepad_Keyboard_Mouse_Button:
             // Use the latest button press
-            Preferred = (MouseMapping && LastButtonInputDevice == EInputMode::Mouse) ? MouseMapping : KeyboardMapping;
+            Preferred = (MouseMapping && (LastButtonInputDevice == EInputMode::Mouse || !KeyboardMapping)) ? MouseMapping : KeyboardMapping;
             break;
         case EInputImageDevicePreference::Gamepad_Keyboard_Mouse_Axis:
             // Use the latest button press
-            Preferred = (MouseMapping && LastAxisInputDevice == EInputMode::Mouse) ? MouseMapping : KeyboardMapping;
+            Preferred = (MouseMapping && (LastAxisInputDevice == EInputMode::Mouse || !KeyboardMapping)) ? MouseMapping : KeyboardMapping;
             break;
         default:
             break;