conditionally use separate bulk writes for sending object

fixes upload to samsung phones
whoozle · Dec 29, 2020 · cce42ee · cce42ee
1 parent a3204c8
commit cce42ee
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mtp/ptp/Session.cpp b/mtp/ptp/Session.cpp
@@ -314,8 +314,12 @@ namespace mtp
 		{
 			DataRequest req(OperationCode::SendObject, transaction.Id);
 			Container container(req, inputStream);
-			_packeter.Write(std::make_shared<ByteArrayObjectInputStream>(container.Data), timeout);
-			_packeter.Write(inputStream, timeout);
+			if (_separateBulkWrites)
+			{
+				_packeter.Write(std::make_shared<ByteArrayObjectInputStream>(container.Data), timeout);
+				_packeter.Write(inputStream, timeout);
+			} else
+				_packeter.Write(std::make_shared<JoinedObjectInputStream>(std::make_shared<ByteArrayObjectInputStream>(container.Data), inputStream), timeout);
 		}
 		ByteArray response;
 		Get(transaction.Id, response);