rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
RocketRobz 2018-10-19 22:29:19 -06:00
parent 7be67d45f9
commit cf745d9ee1
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arm9/source/fileOperations.cpp
View File

@ -14,6 +14,7 @@ u32 copyBuf[copyBufSize];
char clipboard[256]; char clipboard[256];
char clipboardFilename[256]; char clipboardFilename[256];
bool clipboardFolder = false;
bool clipboardOn = false; bool clipboardOn = false;
bool clipboardUsed = false; bool clipboardUsed = false;
bool clipboardDrive = false; // false == SD card, true == Flashcard bool clipboardDrive = false; // false == SD card, true == Flashcard
@ -103,7 +104,7 @@ int fcopy(const char *sourcePath, const char *destinationPath)
} }
printf ("\x1b[16;0H"); printf ("\x1b[16;0H");
printf ("Progress:\n"); printf ("Progress:\n");
printf ("%i/%i Bytes", (int)offset, (int)fsize); printf ("%i/%i Bytes ", (int)offset, (int)fsize);
// Copy file to destination path // Copy file to destination path
numr = fread(copyBuf, 2, copyBufSize, sourceFile); numr = fread(copyBuf, 2, copyBufSize, sourceFile);
@ -115,7 +116,7 @@ int fcopy(const char *sourcePath, const char *destinationPath)
fclose(destinationFile); fclose(destinationFile);
printf ("\x1b[17;0H"); printf ("\x1b[17;0H");
printf ("%i/%i Bytes", (int)fsize, (int)fsize); printf ("%i/%i Bytes ", (int)fsize, (int)fsize);
for (int i = 0; i < 30; i++) swiWaitForVBlank(); for (int i = 0; i < 30; i++) swiWaitForVBlank();
return 1; return 1;

1
arm9/source/fileOperations.h
View File

@ -5,6 +5,7 @@
extern char clipboard[256]; extern char clipboard[256];
extern char clipboardFilename[256]; extern char clipboardFilename[256];
extern bool clipboardFolder;
extern bool clipboardOn; extern bool clipboardOn;
extern bool clipboardUsed; extern bool clipboardUsed;
extern bool clipboardDrive; // false == SD card, true == Flashcard extern bool clipboardDrive; // false == SD card, true == Flashcard

4
arm9/source/file_browse.cpp
View File

@ -309,7 +309,8 @@ bool fileBrowse_paste(char path[PATH_MAX]) {
printf ("_____"); // Clear time printf ("_____"); // Clear time
consoleInit(NULL, 1, BgType_Text4bpp, BgSize_T_256x256, 15, 0, false, true); consoleInit(NULL, 1, BgType_Text4bpp, BgSize_T_256x256, 15, 0, false, true);
printf ("\x1B[47m"); // Print foreground white color printf ("\x1B[47m"); // Print foreground white color
printf("Paste file here?\n\n"); printf(clipboardFolder ? "Paste folder here?" : "Paste file here?");
printf("\n\n");
iprintf ("\x1b[%d;0H", OPTIONS_ENTRIES_START_ROW); iprintf ("\x1b[%d;0H", OPTIONS_ENTRIES_START_ROW);
maxCursors++; maxCursors++;
printf(" Copy path\n"); printf(" Copy path\n");
@ -593,6 +594,7 @@ string browseForFile (void) {
} else if (strcmp(entry->name.c_str(), "..") != 0) { } else if (strcmp(entry->name.c_str(), "..") != 0) {
snprintf(clipboard, sizeof(clipboard), "%s%s", path, entry->name.c_str()); snprintf(clipboard, sizeof(clipboard), "%s%s", path, entry->name.c_str());
snprintf(clipboardFilename, sizeof(clipboardFilename), "%s", entry->name.c_str()); snprintf(clipboardFilename, sizeof(clipboardFilename), "%s", entry->name.c_str());
clipboardFolder = entry->isDirectory;
clipboardOn = true; clipboardOn = true;
clipboardDrive = secondaryDrive; clipboardDrive = secondaryDrive;
clipboardInNitro = (strncmp (path, "nitro:/", 7) == 0); clipboardInNitro = (strncmp (path, "nitro:/", 7) == 0);