From 5047981e7290b5c38942125efef30fbe4d7c36d4 Mon Sep 17 00:00:00 2001
From: mizu <mizu@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 21 Sep 2012 06:21:18 +0000
Subject: [PATCH] git-svn-id:
 file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@713
 385bec56-5757-e545-9c3a-d8741f4650f1

---
 trunk/CardSaveData/Mover/Imp/OMakefile       | 4 ++--
 trunk/CardSaveData/Mover/Imp/source/main.cpp | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/trunk/CardSaveData/Mover/Imp/OMakefile b/trunk/CardSaveData/Mover/Imp/OMakefile
index c530e20..39a742c 100644
--- a/trunk/CardSaveData/Mover/Imp/OMakefile
+++ b/trunk/CardSaveData/Mover/Imp/OMakefile
@@ -40,9 +40,9 @@ LIBS                +=  libnn_ps
 
 IMPORTEE_CIA        =   importee.cia
 
-#SRC_IMPORTEE_PATH      =   ../body/images/$(BUILD_TARGET_DIR)/$(BUILD_TYPE_DIR)/CtrSaveDataMover.cia
+SRC_IMPORTEE_PATH      =   ../body/images/$(BUILD_TARGET_DIR)/$(BUILD_TYPE_DIR)/CtrSaveDataMover.cia
 #とりあえず、マスタリング時は直おき、配置時に改名
-SRC_IMPORTEE_PATH      =   CtrSaveDataMover_master.cia
+#SRC_IMPORTEE_PATH      =   CtrSaveDataMover_master.cia
 
 # ビルドタイプ別に romfs を作る
 #ROMFS_ROOT             =   $`(TARGET.getObjectDirectory)/romfsroot
diff --git a/trunk/CardSaveData/Mover/Imp/source/main.cpp b/trunk/CardSaveData/Mover/Imp/source/main.cpp
index e7936a2..8458556 100644
--- a/trunk/CardSaveData/Mover/Imp/source/main.cpp
+++ b/trunk/CardSaveData/Mover/Imp/source/main.cpp
@@ -80,7 +80,7 @@ bool ImportFile(nn::fs::MediaType mediaType, wchar_t* filename)
 
         while(s32 read = in.Read(readBuf, READ_BUFFER_SIZE))
         {
-            stream->Write(readBuf, read);
+            stream->Write(readBuf, read,true);
         }
         result = nn::am::EndImportProgram(stream);
     }
@@ -250,7 +250,8 @@ void nnMain( void )
     s32 fsize;
     extern bool prohibitHome;// HOME ボタン禁止
 
-    nn::os::Initialize();
+    
+    //nn::os::Initialize();//SDK4.2 より不要、入れると止まる
     nn::fs::Initialize();
 
     //DEA-SUPにて推奨のフリーズ暫定対策：無線デーモンを停止 (2011.3.1 現在)
@@ -276,7 +277,8 @@ void nnMain( void )
     nn::applet::DisableSleep();//スリープ非対応
 
     // ヒープの確保
-    appHeap.Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
+   // appHeap.Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), nn::os::ALLOCATE_OPTION_LINEAR);
+    appHeap.Initialize(nn::os::GetDeviceMemoryAddress(), nn::os::GetDeviceMemorySize(), 0);
 
     const u32 s_GxHeapSize = 0x800000;
     // RenderSystem の準備