Merge pull request #11038 from AdmiralCurtiss/steam-overlay-crash-fix-wgi

WGInput: Work around crash with Steam overlay.

1 files changed, 5 insertions, 1 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
index 414d246069..fc6441bb8d 100644
--- a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
@@ -544,8 +544,12 @@ private:
   {
     try
     {
+      // Workaround for Steam. If Steam's GameOverlayRenderer64.dll is loaded, battery_info is null.
+      auto battery_info = m_raw_controller.try_as<WGI::IGameControllerBatteryInfo>();
+      if (!battery_info)
+        return false;
       const winrt::Windows::Devices::Power::BatteryReport report =
-          m_raw_controller.TryGetBatteryReport();
+          battery_info.TryGetBatteryReport();
       if (!report)
         return false;