ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
soh/soh/OTRGlobals.cpp
View file

@ -403,7 +403,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
std::vector<std::string> args; std::vector<std::string> args;
if (argc > 1) { if (argc > 1) {
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
args.push_back(argv[argc]); args.push_back(argv[i]);
} }
} }
Extractor extract; Extractor extract;
@ -462,7 +462,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
#elif (defined(__WIIU__) || defined(__SWITCH__)) #elif (defined(__WIIU__) || defined(__SWITCH__))
extractStep = ES_VERIFY; extractStep = ES_VERIFY;
#else #else
extractStep = ES_EXTRACT; extractStep = args.empty() ? ES_EXTRACT : ES_EXTRACT_ARGS;
#endif #endif
} else { } else {
std::string msg; std::string msg;
@ -547,11 +547,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
"OK", "", [&]() { exit(0); }); "OK", "", [&]() { exit(0); });
} else { } else {
windowsStep = WS_DONE; windowsStep = WS_DONE;
if (args.size() > 0) { extractStep = args.empty() ? ES_EXTRACT : ES_EXTRACT_ARGS;
extractStep = ES_EXTRACT_ARGS;
} else {
extractStep = ES_EXTRACT;
}
} }
continue; continue;
} }
@ -562,7 +558,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
} }
case ES_EXTRACT_ARGS: { case ES_EXTRACT_ARGS: {
#if !defined(__SWITCH__) && !defined(__WIIU__) #if !defined(__SWITCH__) && !defined(__WIIU__)
if (args.size() == 0) { if (args.empty()) {
SohGui::RegisterPopup( SohGui::RegisterPopup(
"Run Ship of Harkinian", "All files have been processed. Run SoH?", "Yes", "No", "Run Ship of Harkinian", "All files have been processed. Run SoH?", "Yes", "No",
[&]() { [&]() {