From 56148876782c4680c8755fadd3af7f6532fdfaac Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 3 Nov 2022 13:12:55 +1000
Subject: [PATCH] XInputSource: Reload devices on initialize

---
 src/frontend-common/xinput_source.cpp | 1 +
 src/frontend-common/xinput_source.h   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/frontend-common/xinput_source.cpp b/src/frontend-common/xinput_source.cpp
index 57d8a2749..24b38a475 100644
--- a/src/frontend-common/xinput_source.cpp
+++ b/src/frontend-common/xinput_source.cpp
@@ -115,6 +115,7 @@ bool XInputSource::Initialize(SettingsInterface& si, std::unique_lock<std::mutex
     return false;
   }
 
+  ReloadDevices();
   return true;
 }
 
diff --git a/src/frontend-common/xinput_source.h b/src/frontend-common/xinput_source.h
index c499a5752..2368d99f3 100644
--- a/src/frontend-common/xinput_source.h
+++ b/src/frontend-common/xinput_source.h
@@ -68,9 +68,9 @@ private:
   ControllerDataArray m_controllers;
 
   HMODULE m_xinput_module{};
-  DWORD(WINAPI* m_xinput_get_state)(DWORD, XINPUT_STATE*);
-  DWORD(WINAPI* m_xinput_set_state)(DWORD, XINPUT_VIBRATION*);
-  DWORD(WINAPI* m_xinput_get_capabilities)(DWORD, DWORD, XINPUT_CAPABILITIES*);
+  DWORD(WINAPI* m_xinput_get_state)(DWORD, XINPUT_STATE*) = nullptr;
+  DWORD(WINAPI* m_xinput_set_state)(DWORD, XINPUT_VIBRATION*) = nullptr;
+  DWORD(WINAPI* m_xinput_get_capabilities)(DWORD, DWORD, XINPUT_CAPABILITIES*) = nullptr;
 
   static const char* s_axis_names[NUM_AXES];
   static const char* s_button_names[NUM_BUTTONS];