Skip to content

Commit a446413

Browse files
committed
Fix dropped file detection, and fix ShowYesNowBox return checking.
1 parent 26aaf71 commit a446413

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

soh/soh/OTRGlobals.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ void CheckAndCreateModFolder() {
11341134

11351135
extern "C" void InitOTR(int argc, char* argv[]) {
11361136
#if !defined(__SWITCH__) && !defined(__WIIU__)
1137-
if (argc > 0) {
1137+
if (argc > 1) {
11381138
for (int i = 1; i < argc; i++) {
11391139
std::string installPath = Ship::Context::GetAppBundlePath();
11401140
Extractor extract;
@@ -1143,7 +1143,7 @@ extern "C" void InitOTR(int argc, char* argv[]) {
11431143
std::string archive = (extract.IsMasterQuest() ? "oot-mq.o2r" : "oot.o2r");
11441144
if (std::filesystem::exists(Ship::Context::GetAppBundlePath() + "/" + archive)) {
11451145
std::string msg = "Archive for current ROM, " + archive + ", already exists. Extract again?";
1146-
doExtract = !extract.ShowYesNoBox("Confirm Re-extract", msg.c_str());
1146+
doExtract = extract.ShowYesNoBox("Confirm Re-extract", msg.c_str()) == IDYES;
11471147
}
11481148
if (doExtract) {
11491149
extract.CallZapd(installPath, Ship::Context::GetAppDirectoryPath(appShortName));
@@ -1153,7 +1153,7 @@ extern "C" void InitOTR(int argc, char* argv[]) {
11531153
extract.ShowErrorBox("Incompatible File", msg.c_str());
11541154
}
11551155
}
1156-
if (!Extractor::ShowYesNoBox("Run Ship of Harkinian", "All files have been processed. Run SoH?")) {
1156+
if (Extractor::ShowYesNoBox("Run Ship of Harkinian", "All files have been processed. Run SoH?") != IDYES) {
11571157
exit(0);
11581158
}
11591159
}

0 commit comments

Comments
 (0)