loader/ams_mitm: hidKeysHeld, not hidKeysDown (and remove workaround)

2019-03-15 18:34:55 -07:00
parent 7551bebb88
commit 83626923cf
2 changed files with 7 additions and 7 deletions
--- a/stratosphere/loader/source/ldr_hid.cpp
+++ b/stratosphere/loader/source/ldr_hid.cpp
@@ -21,13 +21,16 @@
 #include "ldr_hid.hpp"

 Result HidManagement::GetKeysDown(u64 *keys) {
-    if (!ContentManagement::HasCreatedTitle(0x0100000000000013) || R_FAILED(hidInitialize())) {
+    if (!ContentManagement::HasCreatedTitle(0x0100000000000013)) {
+        return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
+    }
+    
+    if (!serviceIsActive(hidGetSessionService()) && R_FAILED(hidInitialize())) {
        return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
    }
    
    hidScanInput();
    *keys = hidKeysDown(CONTROLLER_P1_AUTO);
    
-    hidExit();
    return 0x0;
 }