From 60aeff8c28383b6481612364243422991cd94d7c Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 2 May 2014 02:50:10 +0000
Subject: [PATCH] =?UTF-8?q?ns:s=E3=81=A7=E3=82=B7=E3=83=A3=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=83=80=E3=82=A6=E3=83=B3=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@798 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../NetworkUpdater/sources/NetworkUpdater/ConsoleRestore.cpp | 5 +++++
 trunk/NetworkUpdater/sources/NetworkUpdater/Controller.cpp   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/trunk/NetworkUpdater/sources/NetworkUpdater/ConsoleRestore.cpp b/trunk/NetworkUpdater/sources/NetworkUpdater/ConsoleRestore.cpp
index af5368f..f560a08 100644
--- a/trunk/NetworkUpdater/sources/NetworkUpdater/ConsoleRestore.cpp
+++ b/trunk/NetworkUpdater/sources/NetworkUpdater/ConsoleRestore.cpp
@@ -31,6 +31,7 @@
 #include <nn/ndm.h>
 #include <nn/nim.h>
 #include <nn/am.h>
+#include <nn/ns.h>
 #include "demo.h"
 
 #include <vector>
@@ -74,6 +75,7 @@ void FinalizeAll()
     s_RenderSystem.Finalize();
 
     s_HwUtility.FinalizeForRestore();
+    nn::ns::FinalizeForShell();
     nn::am::FinalizeForSystemMenu();
     nn::ptm::CTR::Finalize();
     nn::cfg::CTR::system::Finalize();
@@ -121,6 +123,9 @@ extern "C" void nnMain(void)
     // ptmの初期化
     nn::ptm::CTR::Initialize();
 
+    // nsの初期化
+    nn::ns::CTR::InitializeForShell();
+
     // ヒープの確保
     common::InitializeHeap();
 
diff --git a/trunk/NetworkUpdater/sources/NetworkUpdater/Controller.cpp b/trunk/NetworkUpdater/sources/NetworkUpdater/Controller.cpp
index e092dd6..34c71ee 100644
--- a/trunk/NetworkUpdater/sources/NetworkUpdater/Controller.cpp
+++ b/trunk/NetworkUpdater/sources/NetworkUpdater/Controller.cpp
@@ -366,7 +366,9 @@ void ControlState(common::HardwareStateManager& manager, common::OperationMessag
         case SHUTDOWN:
         {
             // シャットダウンする
-            nn::ptm::CTR::ShutdownAsync(0, nn::fnd::TimeSpan::FromSeconds(0));
+            COMMON_LOGGER_RESULT_IF_FAILED(
+                    nn::ns::ShutdownAsync());
+
         }
         break;