From be6d4a5912abcfe36a1f0fcee9d76e050a58c0ce Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 18 Sep 2014 16:04:03 +0200
Subject: 1.8: Simplified item metadata reading.

---
 src/Protocol/Protocol18x.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/Protocol/Protocol18x.cpp')

diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp
index 837c8ec99..a258d9585 100644
--- a/src/Protocol/Protocol18x.cpp
+++ b/src/Protocol/Protocol18x.cpp
@@ -2497,17 +2497,13 @@ bool cProtocol180::ReadItem(cByteBuffer & a_ByteBuffer, cItem & a_Item)
 		a_Item.Empty();
 	}
 
-	HANDLE_PACKET_READ(a_ByteBuffer, ReadChar, char, FirstChar);
-	if (FirstChar == 0)
+	AString Metadata;
+	a_ByteBuffer.ReadAll(Metadata);
+	if ((Metadata.size() == 0) || (Metadata[0] == 0))
 	{
 		// No metadata
 		return true;
 	}
-	a_ByteBuffer.ReverseRead(1);
-
-	// Read the metadata
-	AString Metadata;
-	a_ByteBuffer.ReadAll(Metadata);
 
 	ParseItemMetadata(a_Item, Metadata);
 	return true;
-- 
cgit v1.2.3