The-Homebrew-Cloud/wudd
2
0
Fork 0
mirror of https://github.com/wiiu-env/wudd.git synced 2024-11-22 09:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve return, fix warnings

Browse Source
This commit is contained in:
Maschell 2021-10-16 14:11:28 +02:00
parent 9d607fb1e5
commit 7a6a4ab483
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/GMPartitionsDumperState.cpp
View File

@ -392,11 +392,10 @@ void GMPartitionsDumperState::setError(GMPartitionsDumperState::eErrorState err)
} }
std::string GMPartitionsDumperState::getPathForDevice(eDumpTarget target) const { std::string GMPartitionsDumperState::getPathForDevice(eDumpTarget target) const {
if(target == TARGET_SD){ if (target == TARGET_NTFS){
return "fs:/vol/external01/";
} else if (target == TARGET_NTFS){
return "ntfs0:/"; return "ntfs0:/";
} }
return "fs:/vol/external01/";
} }
std::string GMPartitionsDumperState::ErrorMessage() const { std::string GMPartitionsDumperState::ErrorMessage() const {

9
source/WUDDumperState.cpp
View File

@ -39,9 +39,6 @@ WUDDumperState::~WUDDumperState() {
} }
ApplicationState::eSubState WUDDumperState::update(Input *input) { ApplicationState::eSubState WUDDumperState::update(Input *input) {
if (this->state == STATE_RETURN) {
return ApplicationState::SUBSTATE_RETURN;
}
if (this->state == STATE_ERROR) { if (this->state == STATE_ERROR) {
if (entrySelected(input)) { if (entrySelected(input)) {
return ApplicationState::SUBSTATE_RETURN; return ApplicationState::SUBSTATE_RETURN;
@ -79,7 +76,7 @@ ApplicationState::eSubState WUDDumperState::update(Input *input) {
} }
} else if (this->state == STATE_PLEASE_INSERT_DISC) { } else if (this->state == STATE_PLEASE_INSERT_DISC) {
if (entrySelected(input)) { if (entrySelected(input)) {
this->state = STATE_RETURN; return SUBSTATE_RETURN;
} }
} else if (this->state == STATE_READ_DISC_INFO) { } else if (this->state == STATE_READ_DISC_INFO) {
if (IOSUHAX_FSA_RawRead(gFSAfd, this->sectorBuf, READ_SECTOR_SIZE, 1, 0, this->oddFd) >= 0) { if (IOSUHAX_FSA_RawRead(gFSAfd, this->sectorBuf, READ_SECTOR_SIZE, 1, 0, this->oddFd) >= 0) {
@ -218,7 +215,7 @@ ApplicationState::eSubState WUDDumperState::update(Input *input) {
} else if (this->state == STATE_DUMP_DISC_DONE) { } else if (this->state == STATE_DUMP_DISC_DONE) {
WiiUScreen::drawLinef("Dumping done! Press A to continue"); WiiUScreen::drawLinef("Dumping done! Press A to continue");
if (entrySelected(input)) { if (entrySelected(input)) {
this->state = STATE_RETURN; return SUBSTATE_RETURN;
} }
return ApplicationState::SUBSTATE_RUNNING; return ApplicationState::SUBSTATE_RUNNING;
@ -284,8 +281,6 @@ void WUDDumperState::render() {
} }
} else if (this->state == STATE_DUMP_DISC_DONE) { } else if (this->state == STATE_DUMP_DISC_DONE) {
WiiUScreen::drawLinef("Dumping done! Press A to continue"); WiiUScreen::drawLinef("Dumping done! Press A to continue");
} else if (this->state == STATE_RETURN) {
WiiUScreen::drawLinef("Returning");
} }
ApplicationState::printFooter(); ApplicationState::printFooter();

1
source/WUDDumperState.h
View File

@ -40,7 +40,6 @@ public:
enum eDumpState { enum eDumpState {
STATE_ERROR, STATE_ERROR,
STATE_RETURN,
STATE_OPEN_ODD1, STATE_OPEN_ODD1,
STATE_PLEASE_INSERT_DISC, STATE_PLEASE_INSERT_DISC,
STATE_READ_DISC_INFO, STATE_READ_DISC_INFO,