From 4d940815ad05eec767920bcd6328c77bc0b1e318 Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Mon, 8 Oct 2018 15:22:29 -0600 Subject: [PATCH] Allow file moving from SD to flashcard, and vice-versa --- arm9/source/file_browse.cpp | 9 +++++++-- arm9/source/main.cpp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arm9/source/file_browse.cpp b/arm9/source/file_browse.cpp index e8ec910..414e391 100644 --- a/arm9/source/file_browse.cpp +++ b/arm9/source/file_browse.cpp @@ -286,7 +286,7 @@ bool fileBrowse_paste(char path[PATH_MAX]) { iprintf ("\x1b[%d;0H", ENTRIES_START_ROW); maxCursors++; printf(" Copy path\n"); - if (!clipboardInNitro && secondaryDrive == clipboardDrive) { + if (!clipboardInNitro) { maxCursors++; printf(" Move path\n"); } @@ -323,7 +323,12 @@ bool fileBrowse_paste(char path[PATH_MAX]) { fcopy(clipboard, destPath); } else { printf("Moving..."); - rename(clipboard, destPath); + if (secondaryDrive == clipboardDrive) { + rename(clipboard, destPath); + } else { + fcopy(clipboard, destPath); // Copy file to destination, since renaming won't work + remove(clipboard); // Delete source file after copying + } } clipboardOn = false; // Clear clipboard after copying or moving return true; diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp index ef5827e..fd08790 100644 --- a/arm9/source/main.cpp +++ b/arm9/source/main.cpp @@ -73,7 +73,7 @@ int main(int argc, char **argv) { bool yHeld = false; - snprintf(titleName, sizeof(titleName), "GodMode9i v%i.%i.%i", 1, 1, 0); + snprintf(titleName, sizeof(titleName), "GodMode9i v%i.%i.%i", 1, 2, 0); // initialize video mode videoSetMode(MODE_4_2D);