diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-05-21 16:24:24 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2018-05-21 19:58:22 +0300 |
| commit | a43e72f696bcb719aa45745d96200bdaa123c4a8 (patch) | |
| tree | 0d97c4d60840f58d6c54b2918334c44c3ab60e6d /xs/src/avrdude/avrdude-slic3r.cpp | |
| parent | 4f4649d0464cfd67ccd5bb48013785612f9ceccf (diff) | |
Firmware updater: rework cancelling
Diffstat (limited to 'xs/src/avrdude/avrdude-slic3r.cpp')
| -rw-r--r-- | xs/src/avrdude/avrdude-slic3r.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xs/src/avrdude/avrdude-slic3r.cpp b/xs/src/avrdude/avrdude-slic3r.cpp index 13c37e508..a859200fb 100644 --- a/xs/src/avrdude/avrdude-slic3r.cpp +++ b/xs/src/avrdude/avrdude-slic3r.cpp @@ -21,10 +21,10 @@ static void avrdude_message_handler_closure(const char *msg, unsigned size, void } // Used by our custom code in avrdude to report progress in the GUI -static bool avrdude_progress_handler_closure(const char *task, unsigned progress, void *user_p) +static void avrdude_progress_handler_closure(const char *task, unsigned progress, void *user_p) { auto *progress_fn = reinterpret_cast<AvrDude::ProgressFn*>(user_p); - return (*progress_fn)(task, progress); + (*progress_fn)(task, progress); } @@ -134,6 +134,11 @@ AvrDude::Ptr AvrDude::run() return self; } +void AvrDude::cancel() +{ + ::avrdude_cancel(); +} + void AvrDude::join() { if (p && p->avrdude_thread.joinable()) { |