From a78a615b558085c92026d3a3ad9c29cd8803053e Mon Sep 17 00:00:00 2001
From: wiidev <wiidev@users.noreply.github.com>
Date: Mon, 11 Nov 2019 20:00:00 +0000
Subject: [PATCH] Disconnect Wiimotes before WPAD_Shutdown

---
 source/StartUpProcess.cpp | 3 ++-
 source/sys.cpp            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/StartUpProcess.cpp b/source/StartUpProcess.cpp
index d42a624f..749e6874 100644
--- a/source/StartUpProcess.cpp
+++ b/source/StartUpProcess.cpp
@@ -6,6 +6,7 @@
 #include "input.h"
 #include "themes/CTheme.h"
 #include "gecko.h"
+#include "wpad.h"
 #include "Controls/DeviceHandler.hpp"
 #include "wad/nandtitle.h"
 #include "SystemMenu/SystemMenuResources.h"
@@ -298,7 +299,7 @@ int StartUpProcess::Execute()
 			USBStorage2_Deinit();
 
 		// Shut down pads
-		WPAD_Shutdown();
+		Wpad_Disconnect();
 
 		// Loading now the cios setup in the settings
 		IosLoader::LoadAppCios();
diff --git a/source/sys.cpp b/source/sys.cpp
index e29107f3..688724bd 100644
--- a/source/sys.cpp
+++ b/source/sys.cpp
@@ -1,6 +1,5 @@
 #include <gctypes.h>
 #include <ogc/system.h>
-#include <wiiuse/wpad.h>
 
 #include "mload/mload.h"
 #include "banner/BannerAsync.h"
@@ -26,6 +25,7 @@
 #include "menu.h"
 #include "video.h"
 #include "gecko.h"
+#include "wpad.h"
 #include "wad/nandtitle.h"
 
 extern "C"
@@ -116,7 +116,7 @@ void AppCleanUp(void)
 
 	ResourceManager::DestroyInstance();
 
-	WPAD_Shutdown();
+	Wpad_Disconnect();
 	ISFS_Deinitialize();
 }