diff --git a/source/arm11/menu/menu_func.c b/source/arm11/menu/menu_func.c index d76fe14..12acddf 100644 --- a/source/arm11/menu/menu_func.c +++ b/source/arm11/menu/menu_func.c @@ -408,8 +408,7 @@ { s64 readBytes = (nand_size - p > DEVICE_BUFSIZE) ? DEVICE_BUFSIZE : nand_size - p; s32 errcode = 0; - if (!(p % (DEVICE_BUFSIZE*4))) - ee_printf_progress("NAND backup", PROGRESS_WIDTH, p, nand_size); + ee_printf_progress("NAND backup", PROGRESS_WIDTH, p, nand_size); updateScreens(); if ((errcode = fReadToDeviceBuffer(devHandle, p, readBytes, dbufHandle)) != 0) @@ -482,7 +481,7 @@ BatteryState battery; getBatteryState(&battery); if ((battery.percent <= 20) && !battery.charging) { - ee_printf("Battery below 20% and not charging.\nPlug in the charger and retry.\n"); + ee_printf("Battery below 20%% and not charging.\nPlug in the charger and retry.\n"); goto fail; } @@ -581,8 +580,7 @@ { s64 readBytes = (file_size - p > DEVICE_BUFSIZE) ? DEVICE_BUFSIZE : file_size - p; s32 errcode = 0; - if (!(p % (DEVICE_BUFSIZE*4))) - ee_printf_progress("NAND restore", PROGRESS_WIDTH, p, file_size); + ee_printf_progress("NAND restore", PROGRESS_WIDTH, p, file_size); updateScreens(); if ((errcode = fReadToDeviceBuffer(fHandle, p, readBytes, dbufHandle)) != 0) diff --git a/source/arm11/menu/menu_util.c b/source/arm11/menu/menu_util.c index 4d290e7..ab0672a 100644 --- a/source/arm11/menu/menu_util.c +++ b/source/arm11/menu/menu_util.c @@ -293,7 +293,8 @@ { if (cancelAllowed) { - ee_printf("\n\nCancel current operation?\n(A to confirm, B to continue)\n\n"); + ee_printf("\r%60.60s\r", ""); // delete current line + ee_printf("Cancel current operation?\n(A to confirm, B to continue)\n\n"); updateScreens(); do { @@ -311,7 +312,8 @@ } else { - ee_printf("\n\nCancel is not allowed here.\n\n"); + ee_printf("\r%60.60s\r", ""); // delete current line + ee_printf("Cancel is not allowed here.\n\n"); } hidGetPowerButton(true); // poweroff stopped