mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-22 22:44:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix bad args handling in extractor (#6501)

Browse Source
This commit is contained in:
Philip Dubé
2026-04-14 01:00:16 +00:00
committed by GitHub
parent 13ebc31ec7
commit adb1e46ba9
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/OTRGlobals.cpp
+4 -8
View File
@@ -403,7 +403,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
std::vector<std::string> args;
if (argc > 1) {
for (int i = 1; i < argc; i++) {
args.push_back(argv[argc]);
args.push_back(argv[i]);
}
}
Extractor extract;
@@ -462,7 +462,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
#elif (defined(__WIIU__) || defined(__SWITCH__))
extractStep = ES_VERIFY;
#else
extractStep = ES_EXTRACT;
extractStep = args.empty() ? ES_EXTRACT : ES_EXTRACT_ARGS;
#endif
} else {
std::string msg;
@@ -547,11 +547,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
"OK", "", [&]() { exit(0); });
} else {
windowsStep = WS_DONE;
if (args.size() > 0) {
extractStep = ES_EXTRACT_ARGS;
} else {
extractStep = ES_EXTRACT;
}
extractStep = args.empty() ? ES_EXTRACT : ES_EXTRACT_ARGS;
}
continue;
}
@@ -562,7 +558,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
}
case ES_EXTRACT_ARGS: {
#if !defined(__SWITCH__) && !defined(__WIIU__)
if (args.size() == 0) {
if (args.empty()) {
SohGui::RegisterPopup(
"Run Ship of Harkinian", "All files have been processed. Run SoH?", "Yes", "No",
[&]() {