projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74c2967
)
Fix progress reporting.
author
Carl Hetherington
<cth@carlh.net>
Sun, 29 Mar 2020 20:36:51 +0000
(22:36 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 29 Mar 2020 20:36:51 +0000
(22:36 +0200)
src/lib/copy_to_drive_job.cc
patch
|
blob
|
history
diff --git
a/src/lib/copy_to_drive_job.cc
b/src/lib/copy_to_drive_job.cc
index 828946123b6f9ce52a52e9c2f89d8c6f421c1d97..bd551e00c49ab18cc09fb59ba266d84f617b9a75 100644
(file)
--- a/
src/lib/copy_to_drive_job.cc
+++ b/
src/lib/copy_to_drive_job.cc
@@
-68,6
+68,7
@@
CopyToDriveJob::run ()
}
while (true) {
+ bool formatting = false;
string s = _nanomsg.blocking_get ();
if (s == DIST_WRITER_OK) {
set_state (FINISHED_OK);
@@
-79,8
+80,12
@@
CopyToDriveJob::run ()
} else if (s == DIST_WRITER_FORMATTING) {
sub ("Formatting drive");
set_progress_unknown ();
+ formatting = true;
} else if (s == DIST_WRITER_PROGRESS) {
- sub ("Copying DCP");
+ if (formatting) {
+ sub ("Copying DCP");
+ formatting = false;
+ }
set_progress (raw_convert<float>(_nanomsg.blocking_get()));
}
}