Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the build - would loop forever if there were no files to send #4188

Merged
merged 2 commits into from
Jun 28, 2024
Merged

fix the build - would loop forever if there were no files to send #4188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0482f5
fix the build - would loop forever if there were no files to send
geeksville Jun 28, 2024
5fd18a0
Merge branch 'master' into pr-fixbuild
geeksville Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/mesh/PhoneAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,15 +354,14 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)

case STATE_SEND_FILEMANIFEST: {
LOG_INFO("getFromRadio=STATE_SEND_FILEMANIFEST\n");
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag;
if (config_state < filesManifest.size()) {
// last element
if (config_state == filesManifest.size()) { // also handles an empty filesManifest
state = STATE_SEND_COMPLETE_ID;
config_state = 0;
} else {
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_fileInfo_tag;
fromRadioScratch.fileInfo = filesManifest.at(config_state);
config_state++;
// last element
if (config_state == filesManifest.size()) {
state = STATE_SEND_COMPLETE_ID;
config_state = 0;
}
}
break;
}
Expand Down
Loading