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

Remove some duplicate defines

Browse Source
This commit is contained in:
RocketRobz 2020-02-03 18:52:06 -07:00
parent 86b4fbd85e
commit bb7451a8f4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arm9/source/file_browse.cpp
View File

@ -519,8 +519,7 @@ string browseForFile (void) {
getcwd(path, PATH_MAX); getcwd(path, PATH_MAX);
if ((!(held & KEY_R) && (pressed & KEY_A)) if ((!(held & KEY_R) && (pressed & KEY_A))
|| (!dirContents.at(fileOffset).isDirectory && (held & KEY_R) && (pressed & KEY_A))) { || (!entry->isDirectory && (held & KEY_R) && (pressed & KEY_A))) {
DirEntry* entry = &dirContents.at(fileOffset);
if (((strcmp (entry->name.c_str(), "..") == 0) && (strcmp (path, (secondaryDrive ? "fat:/" : "sd:/")) == 0)) if (((strcmp (entry->name.c_str(), "..") == 0) && (strcmp (path, (secondaryDrive ? "fat:/" : "sd:/")) == 0))
|| ((strcmp (entry->name.c_str(), "..") == 0) && (strcmp (path, "nitro:/") == 0))) || ((strcmp (entry->name.c_str(), "..") == 0) && (strcmp (path, "nitro:/") == 0)))
{ {
@ -551,8 +550,7 @@ string browseForFile (void) {
} }
// Directory options // Directory options
if (dirContents.at(fileOffset).isDirectory && (held & KEY_R) && (pressed & KEY_A)) { if (entry->isDirectory && (held & KEY_R) && (pressed & KEY_A)) {
DirEntry* entry = &dirContents.at(fileOffset);
int getOp = fileBrowse_A(entry, path); int getOp = fileBrowse_A(entry, path);
if (getOp == 1 || getOp == 2) { if (getOp == 1 || getOp == 2) {
getDirectoryContents (dirContents); // Refresh directory listing getDirectoryContents (dirContents); // Refresh directory listing