diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 47744ad..0b5d937 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index d83daf0..59becc4 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 13e9c9c..486833b 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 6dca2bb..2a494aa 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -2981,6 +2981,20 @@ private: System::Windows::Forms::CheckBox^ cboxIsUnnecessaryRating; this->cboxIsPhotoEx->Checked = this->IsCheckedPhotoEx; } + // バックアップメモリの表示をNANDアプリのときに「なし」にする + void maskBackupMemoryForms(void) + { + if( this->hSrl->IsMediaNand ) + { + this->combBackup->SelectedIndex = this->combBackup->Items->Count - 2; + this->combBackup->Enabled = false; + } + else + { + this->combBackup->Enabled = true; + } + } + private: // ---------------------------------------------- // フォームとSRL内情報を矛盾なく一致させる diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp index 8ab9ea0..5479b96 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp @@ -214,15 +214,7 @@ void Form1::setSrlForms(void) // ROMヘッダには関係ないが // NANDアプリのときにバックアップメモリを自動的に「なし」にしておく - if( this->hSrl->IsMediaNand ) - { - this->combBackup->SelectedIndex = this->combBackup->Items->Count - 2; - this->combBackup->Enabled = false; - } - else - { - this->combBackup->Enabled = true; - } + this->maskBackupMemoryForms(); } // setSrlForms() // ---------------------------------------------- diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp index b01cfd7..a0456df 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_tmp.cpp @@ -248,7 +248,7 @@ void Form1::loadTmp( System::String ^filename ) this->maskRatingForms(); // ペアレンタルコントロール情報をリージョンに合わせる this->changeUnnecessaryRatingForms(false); // 一度コンボボックスがenableになるので再設定 - + this->maskBackupMemoryForms(); // NANDアプリのときのバックアップメモリの自動設定 } //loadTmp() // ----------------------------------------------