From 81a638cabba80635e88a54e54ede646b229d2992 Mon Sep 17 00:00:00 2001
From: Albert Liu <45282415+ggrtk@users.noreply.github.com>
Date: Fri, 13 Nov 2020 07:10:30 -0800
Subject: [PATCH] Pad: Fix loading controllers from save states

---
 src/core/pad.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/core/pad.cpp b/src/core/pad.cpp
index 99da1f91f..5e0c4fb7e 100644
--- a/src/core/pad.cpp
+++ b/src/core/pad.cpp
@@ -67,7 +67,11 @@ bool Pad::DoState(StateWrapper& sw)
 
         m_controllers[i].reset();
         if (state_controller_type != ControllerType::None)
+        {
           m_controllers[i] = Controller::Create(state_controller_type, i);
+          if (!sw.DoMarker("Controller") || !m_controllers[i]->DoState(sw))
+            return false;
+        }
       }
       else
       {