diff --git a/source/gc/fileOps.c b/source/gc/fileOps.c index 1556be4b..f87ba764 100644 --- a/source/gc/fileOps.c +++ b/source/gc/fileOps.c @@ -27,6 +27,7 @@ en exposed s_fsop fsop structure can be used by callback to update operation sta static u8 *buff = NULL; static FILE *fs = NULL, *ft = NULL; +static u32 bytes; static u32 block = 32768; static u32 blockIdx = 0; static u32 blockInfo[2] = {0,0}; @@ -153,7 +154,7 @@ bool fsop_CopyFile (char *source, char *target, progress_callback_t spinner, voi int err = 0; u32 size; - u32 bytes, rb,wb; + u32 rb,wb; fs = fopen(source, "rb"); if (!fs) @@ -198,7 +199,6 @@ bool fsop_CopyFile (char *source, char *target, progress_callback_t spinner, voi while (stopThread != 0) usleep (5); - bytes = 0; u32 bi; do { @@ -296,6 +296,7 @@ bool fsop_CopyFolder (char *source, char *target, progress_callback_t spinner, v { gprintf("DML game USB->SD job started!\n"); + bytes = 0; folderSize = fsop_GetFolderBytes(source); return doCopyFolder(source, target, spinner, spinner_data); } diff --git a/source/menu/menu_config.cpp b/source/menu/menu_config.cpp index fb0a1ce1..77ff79eb 100644 --- a/source/menu/menu_config.cpp +++ b/source/menu/menu_config.cpp @@ -41,7 +41,7 @@ void CMenu::_enableNandEmu(bool fromconfig) (m_current_view == COVERFLOW_CHANNEL && (DeviceHandler::Instance()->GetFSType(currentPartition) != PART_FS_FAT || (!isD2XnewerThanV6 && DeviceHandler::Instance()->PathToDriveType(m_appDir.c_str()) == currentPartition) || (!isD2XnewerThanV6 && DeviceHandler::Instance()->PathToDriveType(m_dataDir.c_str()) == currentPartition))) || - (m_current_view == COVERFLOW_HOMEBREW && DeviceHandler::Instance()->GetFSType(currentPartition) == PART_FS_WBFS)) + ((m_current_view == COVERFLOW_HOMEBREW || m_current_view == COVERFLOW_DML) && DeviceHandler::Instance()->GetFSType(currentPartition) == PART_FS_WBFS)) { currentPartition = loopNum(currentPartition + direction, (int)USB8); if (limiter > 10) break;