From 17960517bad5d2d07effb28b744ac8d907d571e0 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 2 Feb 2021 18:32:29 -0800 Subject: [PATCH] hid: fix sm usage --- libstratosphere/source/hid/hid_api.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libstratosphere/source/hid/hid_api.cpp b/libstratosphere/source/hid/hid_api.cpp index ece8133f..ba07cde5 100644 --- a/libstratosphere/source/hid/hid_api.cpp +++ b/libstratosphere/source/hid/hid_api.cpp @@ -40,14 +40,12 @@ namespace ams::hid { /* Helper. */ void InitializeHid() { - R_ABORT_UNLESS(smInitialize()); - ON_SCOPE_EXIT { smExit(); }; - { + sm::DoWithSession([&]() { R_ABORT_UNLESS(hidInitialize()); hidInitializeNpad(); R_ABORT_UNLESS(hidSetSupportedNpadIdType(NpadIdTypes, NumNpadIdTypes)); R_ABORT_UNLESS(hidSetSupportedNpadStyleSet(HidNpadStyleSet_NpadStandard | HidNpadStyleTag_NpadSystemExt)); - } + }); } Result EnsureHidInitialized() {