From f92853bb885fb81bf1315dd9feac05bd93eecae0 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 27 Aug 2018 16:06:46 +0000 Subject: [PATCH] Core: CopyStream progress fix git-svn-id: svn://ultimatepp.org/upp/trunk@12201 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Stream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp index 58477c532..4cc1bf058 100644 --- a/uppsrc/Core/Stream.cpp +++ b/uppsrc/Core/Stream.cpp @@ -1402,11 +1402,11 @@ int64 CopyStream(Stream& dest, Stream& src, int64 count, Gate prog int64 done = 0; int64 total = count; while(count > 0 && (loaded = src.Get(~temp, (int)min(count, block))) > 0) { + count -= loaded; + done += loaded; if(progress(done, total)) return -1; dest.Put(~temp, loaded); - count -= loaded; - done += loaded; } return done; }