From a43e72f696bcb719aa45745d96200bdaa123c4a8 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Mon, 21 May 2018 15:24:24 +0200 Subject: Firmware updater: rework cancelling --- xs/src/avrdude/avrdude-slic3r.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'xs/src/avrdude/avrdude-slic3r.cpp') 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(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()) { -- cgit v1.2.3