Clear updater state on any error #6325
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes esp8266#2090 The Updater checks that an update isn't already in progress on ::begin, but when an error happens in the middle of an upload it's impossible to actually reset this flag w/o a reboot. Reset the state members (esp. _size) on any error condition so that you can restart the transfer with a new ::begin. Any error condition is fatal, anyway, so there is no reason not to clear the current state at that point.
devyte
approved these changes
Jul 21, 2019
d-a-v
approved these changes
Jul 21, 2019
|
I believe I solved this by calling
Arduino/cores/esp8266/Updater.cpp Line 189 in 5d5cd1d So imho the webupdater should be fixed and not the updater. I didn't look into the issue though. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2090
The Updater checks that an update isn't already in progress on ::begin,
but when an error happens in the middle of an upload it's impossible to
actually reset this flag w/o a reboot.
Reset the state members (esp. _size) on any error condition so
that you can restart the transfer with a new ::begin. Any error
condition is fatal, anyway, so there is no reason not to clear the
current state at that point.