diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp index 11b4898..0e81600 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp @@ -1386,11 +1386,12 @@ void ExportTouchPanelCfgData() common::SdMountManager::Unmount(); } -void ImportTouchPanelCfgData(nn::cfg::CTR::detail::TouchPanelCfgData* data) +bool ImportTouchPanelCfgData(nn::cfg::CTR::detail::TouchPanelCfgData* data) { using namespace nn::cfg::CTR::detail; nn::Result result; + bool retval = false; COMMON_LOGGER("Import TouchPanelData\n"); @@ -1408,6 +1409,7 @@ void ImportTouchPanelCfgData(nn::cfg::CTR::detail::TouchPanelCfgData* data) { // SDから読み出し成功 std::memcpy(data, buf, readSize); + retval = true; } else { @@ -1417,17 +1419,20 @@ void ImportTouchPanelCfgData(nn::cfg::CTR::detail::TouchPanelCfgData* data) } common::SdMountManager::Unmount(); + return retval; } void InitializeHardwareDependentSetting() { using namespace nn::cfg::CTR::detail; - nn::Result result; + nn::Result result = nn::ResultSuccess(); nn::cfg::CTR::detail::TouchPanelCfgData touchPanelCfgData; - ImportTouchPanelCfgData(&touchPanelCfgData); - result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_TOUCHPANEL), &touchPanelCfgData, - sizeof(TouchPanelCfgData)); + if(ImportTouchPanelCfgData(&touchPanelCfgData)) + { + result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_TOUCHPANEL), &touchPanelCfgData, + sizeof(TouchPanelCfgData)); + } COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);