diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme index 02b9d9828..6bf363373 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme +++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme @@ -106,7 +106,7 @@ + isEnabled = "NO"> requested_roms; - ROMMachine::ROMFetcher rom_fetcher = [&requested_roms, &arguments] + std::vector checked_paths; + ROMMachine::ROMFetcher rom_fetcher = [&requested_roms, &arguments, &checked_paths] (const std::vector &roms) -> std::vector>> { requested_roms.insert(requested_roms.end(), roms.begin(), roms.end()); @@ -716,13 +717,16 @@ int main(int argc, char *argv[]) { std::vector>> results; for(const auto &rom: roms) { FILE *file = nullptr; + std::vector rom_checked_paths; for(const auto &path: paths) { std::string local_path = path + rom.machine_name + "/" + rom.file_name; file = std::fopen(local_path.c_str(), "rb"); + rom_checked_paths.push_back(local_path); if(file) break; } if(!file) { + std::copy(rom_checked_paths.begin(), rom_checked_paths.end(), std::back_inserter(checked_paths)); results.emplace_back(nullptr); continue; } @@ -737,8 +741,10 @@ int main(int argc, char *argv[]) { if(read == data->size()) results.emplace_back(std::move(data)); - else + else { + std::copy(rom_checked_paths.begin(), rom_checked_paths.end(), std::back_inserter(checked_paths)); results.emplace_back(nullptr); + } } return results; @@ -766,7 +772,7 @@ int main(int argc, char *argv[]) { if(!rom.descriptive_name.empty()) { std::cerr << rom.descriptive_name << "; "; } - std::cerr << "usual crc32s: "; + std::cerr << ((rom.crc32s.size() > 1) ? "usual crc32s: " : "usual crc32: "); bool is_first = true; for(const auto crc32: rom.crc32s) { if(!is_first) std::cerr << ", "; @@ -775,6 +781,14 @@ int main(int argc, char *argv[]) { } std::cerr << ")" << std::endl; } + std::cerr << std::endl << "Tried specifically: "; + bool is_first = true; + for(const auto &path: checked_paths) { + if(!is_first) std::cerr << "; "; + std::cerr << path; + is_first = false; + } + std::cerr << std::endl; break; }