Merge pull request #65 from w3irDv/enh/mngslot

force manual backup always to root backupset
Xpl0itU · Jan 6, 2025 · 7f723ec · 7f723ec
2 parents d6a5424 + a491957
commit 7f723ec
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/menu/MainMenuState.cpp b/src/menu/MainMenuState.cpp
@@ -51,12 +51,10 @@ ApplicationState::eSubState MainMenuState::update(Input *input) {
         if (input->get(TRIGGER, PAD_BUTTON_A)) {
             switch (cursorPos) {
                 case 0:
-                    //BackupSetList::setBackupSetToRoot();
                     this->state = STATE_DO_SUBSTATE;
                     this->subState = std::make_unique<WiiUTitleListState>(this->wiiutitles, this->wiiuTitlesCount);
                     break;
                 case 1:
-                    //BackupSetList::setBackupSetToRoot();
                     this->state = STATE_DO_SUBSTATE;
                     this->subState = std::make_unique<vWiiTitleListState>(this->wiititles, this->vWiiTitlesCount);
                     break;
@@ -65,12 +63,10 @@ ApplicationState::eSubState MainMenuState::update(Input *input) {
                     this->subState = std::make_unique<BatchBackupState>(this->wiiutitles, this->wiititles, this->wiiuTitlesCount, this->vWiiTitlesCount);
                     break;
                 case 3:
-                    //BackupSetList::setBackupSetToRoot();
                     this->state = STATE_DO_SUBSTATE;
                     this->subState = std::make_unique<BatchRestoreState>(this->wiiutitles, this->wiititles, this->wiiuTitlesCount, this->vWiiTitlesCount);
                     break;
                 case 4:
-                    //BackupSetList::setBackupSetToRoot();
                     this->state = STATE_DO_SUBSTATE;
                     this->substateCalled = STATE_BACKUPSET_MENU;
                     this->subState = std::make_unique<BackupSetListState>();

diff --git a/src/menu/TitleOptionsState.cpp b/src/menu/TitleOptionsState.cpp
@@ -248,7 +248,6 @@ void TitleOptionsState::render() {
 ApplicationState::eSubState TitleOptionsState::update(Input *input) {
     if (this->state == STATE_TITLE_OPTIONS) {
         if (input->get(TRIGGER, PAD_BUTTON_B)) {
-            BackupSetList::setBackupSetSubPathToRoot(); // reset nxt operations to current backupSet
             return SUBSTATE_RETURN;
         }
         if (input->get(TRIGGER, PAD_BUTTON_X))

diff --git a/src/menu/TitleTaskState.cpp b/src/menu/TitleTaskState.cpp
@@ -75,7 +75,8 @@ ApplicationState::eSubState TitleTaskState::update(Input *input) {
                 if (!this->title.saveInit) {
                     promptError(LanguageUtils::gettext("No save to Backup."));
                     noError = false;
-                }
+                } else 
+                    BackupSetList::setBackupSetSubPathToRoot(); // from backup menu, always backup to root
             }
 
             if (this->task == restore) {
@@ -89,10 +90,12 @@ ApplicationState::eSubState TitleTaskState::update(Input *input) {
                 if (!this->title.saveInit) {
                     promptError(LanguageUtils::gettext("No save to Wipe."));
                     noError = false;
-                }
+                } else
+                    BackupSetList::setBackupSetSubPathToRoot(); // default behaviour: unaware of backupsets
             }
 
             if ((this->task == importLoadiine) || (this->task == exportLoadiine)) {
+                BackupSetList::setBackupSetSubPathToRoot(); // default behaviour: unaware of backupsets
                 char gamePath[PATH_SIZE];
                 memset(versionList, 0, 0x100 * sizeof(int));
                 if (!getLoadiineGameSaveDir(gamePath, this->title.productCode, this->title.longName, this->title.highID, this->title.lowID)) {
@@ -115,7 +118,8 @@ ApplicationState::eSubState TitleTaskState::update(Input *input) {
                 if (!this->title.saveInit) {
                     promptError(LanguageUtils::gettext("No save to Copy."));
                     noError = false;
-                }
+                } else
+                    BackupSetList::setBackupSetSubPathToRoot(); // default behaviour: unaware of backupsets
             }
             if (noError) {
                 DrawUtils::setRedraw(true);

diff --git a/src/savemng.cpp b/src/savemng.cpp
@@ -997,7 +997,7 @@ void copySavedata(Title *title, Title *titleb, int8_t wiiuuser, int8_t wiiuuser_
     int slotb = getEmptySlot(titleb->highID, titleb->lowID);
     if ((slotb >= 0) && promptConfirm(ST_YES_NO, LanguageUtils::gettext("Backup current savedata first to next empty slot?"))) {
         backupSavedata(titleb, slotb, wiiuuser, common, LanguageUtils::gettext("pre-copyToOtherDev backup"));
-        promptError(LanguageUtils::gettext("Backup done. Now copying Savedata."));
+        promptError(LanguageUtils::gettext("Backup done. Now copying Savedata."));       
     }
 
     std::string path = (isUSB ? (getUSB() + "/usr/save").c_str() : "storage_mlc01:/usr/save");