summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-21 13:30:14 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-21 13:30:14 +0100
commitcbaed1119cdf3acb8662e5240f59706722437d94 (patch)
tree4167a77a1f529faabb5718b4d26e269f47a09865 /src/lib
parent4488ca79635bda37e034b888d1c43618f5e4285e (diff)
Tidy up progress reporting for examine content.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/examine_content_job.cc4
-rw-r--r--src/lib/job.cc3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 44a9f4ce9..40665e1e8 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -45,6 +45,10 @@ ExamineContentJob::~ExamineContentJob ()
string
ExamineContentJob::name () const
{
+ if (_fs->name().empty ()) {
+ return "Examine content";
+ }
+
return String::compose ("Examine content of %1", _fs->name());
}
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 2049e69b0..68cdce3cd 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -161,6 +161,7 @@ void
Job::set_progress (float p)
{
boost::mutex::scoped_lock lm (_progress_mutex);
+ _progress_unknown = false;
_stack.back().normalised = p;
}
@@ -232,7 +233,7 @@ Job::set_error (string e)
_error = e;
}
-/** Say that this job's progress will always be unknown */
+/** Say that this job's progress will be unknown until further notice */
void
Job::set_progress_unknown ()
{