diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-02-25 08:00:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-02-25 08:00:40 +0000 |
| commit | acaa6e95d2833b7d186aac5f2a2179c75188a52a (patch) | |
| tree | e0bfe220ade996411ad4c4603953a780961245d1 /src | |
| parent | 135a80be74db7298d5f4dd3c82f19158d877b47a (diff) | |
| parent | bbd352c3a0acf312e66b8be0d8bfb475275102d6 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/job.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index bde2c8cfd..bfad65a0a 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -272,10 +272,11 @@ Job::status () const } stringstream s; - if (!finished () && p >= 0 && t > 10 && r > 0) { - s << pc << "%; " << seconds_to_approximate_hms (r) << " remaining"; - } else if (!finished () && (t <= 10 || r == 0)) { + if (!finished ()) { s << pc << "%"; + if (p >= 0 && t > 10 && r > 0) { + s << "; " << seconds_to_approximate_hms (r) << " remaining"; + } } else if (finished_ok ()) { s << "OK (ran for " << seconds_to_hms (_ran_for) << ")"; } else if (finished_in_error ()) { |