From 3bde69d61e2a95c789f0ff95f24ffc5bd9991fe3 Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Sun, 9 Mar 2014 12:07:08 +0000 Subject: [PATCH] - fixed serialisation issue - fixed compilation issue in circle dialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7180 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/serialiser/rsnxsitems.cc | 2 +- retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libretroshare/src/serialiser/rsnxsitems.cc b/libretroshare/src/serialiser/rsnxsitems.cc index 19e44c049..3d217ee72 100644 --- a/libretroshare/src/serialiser/rsnxsitems.cc +++ b/libretroshare/src/serialiser/rsnxsitems.cc @@ -1075,7 +1075,7 @@ uint32_t RsNxsSerialiser::sizeNxsSyncGrpItem(RsNxsSyncGrpItem *item) s += 4; // publishTs s += 1; // flag s += item->grpId.serial_size(); - s + item->authorId.serial_size(); + s += item->authorId.serial_size(); return s; } diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index 34882ce2f..a93cb764c 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -28,6 +28,8 @@ #include #include +#include + #define CREATECIRCLEDIALOG_CIRCLEINFO 2 #define CREATECIRCLEDIALOG_IDINFO 3