summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-25 09:50:15 +0100
committerCarl Hetherington <cth@carlh.net>2016-10-25 09:50:15 +0100
commit107d88c10c11e204dba3a5ca1591d9966f4542cd (patch)
tree4fdf65e1a293604dd049962e7a6f449570cf8e6f /src/lib
parent331b1389da0505a64a6c77eaecf06eb59382b947 (diff)
parent6e7d2a4b02f5ad729e61f13770bd08fb7da2d215 (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/writer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index bb65c1f2b..c0dbf0562 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -39,6 +39,7 @@
#include <fstream>
#include <cerrno>
#include <iostream>
+#include <cfloat>
#include "i18n.h"
@@ -632,7 +633,7 @@ Writer::set_digest_progress (Job* job, float progress)
_digest_progresses[boost::this_thread::get_id()] = progress;
boost::mutex::scoped_lock lm (_digest_progresses_mutex);
- float min_progress = 0;
+ float min_progress = FLT_MAX;
for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
min_progress = min (min_progress, i->second);
}