diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-08-06 22:36:21 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-08-11 22:40:59 +0200 |
| commit | 1d3085c403f265fb203654d461c0b77974205f2f (patch) | |
| tree | 30682a7fbcc9af19321d472e75799bf20e1e4c33 | |
| parent | f2b10879dcafccdb28f88d53dc1fc22094b96c1d (diff) | |
Cleanup: set job state to cancelled in a different place.
| -rw-r--r-- | src/lib/job.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 50dcc336e..5bed3f0d2 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -199,9 +199,7 @@ Job::run_wrapper () set_state (FINISHED_ERROR); } catch (boost::thread_interrupted &) { - - set_state (FINISHED_CANCELLED); - + /* The job was cancelled; there's nothing else we need to do here */ } catch (sub::SubripError& e) { string extra = "Error is near:\n"; @@ -601,6 +599,8 @@ Job::cancel () _thread.interrupt (); _thread.join (); + + set_state (FINISHED_CANCELLED); } |
