Add EstimatedBytesToUpload to NotifyFileUploadingPatch.

Merged back changes from the test refactor branch to reduce diffs.

1 files changed, 6 insertions, 3 deletions

diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp
index 58cf0ebb..fb43d7ce 100644
--- a/bin/bbackupd/BackupClientDirectoryRecord.cpp
+++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp
@@ -1745,8 +1745,6 @@ int64_t BackupClientDirectoryRecord::UploadFile(
 			if(diffFromID != 0)
 			{
 				// Found an old version
-				rNotifier.NotifyFileUploadingPatch(this,
-					rNonVssFilePath);
 
 				// Get the index
 				std::auto_ptr<IOStream> blockIndexStream(connection.ReceiveStream());
@@ -1778,7 +1776,12 @@ int64_t BackupClientDirectoryRecord::UploadFile(
 			}
 		}
 
-		if(!apStreamToUpload.get()) // No patch upload, so do a normal upload
+		if(apStreamToUpload.get())
+		{
+			rNotifier.NotifyFileUploadingPatch(this, rNonVssFilePath,
+				apStreamToUpload->GetBytesToUpload());
+		}
+		else // No patch upload, so do a normal upload
 		{
 			// below threshold or nothing to diff from, so upload whole
 			rNotifier.NotifyFileUploading(this, rNonVssFilePath);