From 9881d248ec85e3be61cd29d048e3553be6974b4b Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Mon, 18 Mar 2019 17:47:51 +0100
Subject: [PATCH] - updated CHANGELOG

---
 CHANGELOG                                   | 5 +++++
 src/iec61850/server/mms_mapping/reporting.c | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3cd3a47ab..c29b0e011 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 Changes to version 1.3.3
 ------------------------
+
+- IEC 61850 server: reporting - fixed problem with removing old GI reports when latest report is also GI
+- IEC 61850 client: fixed problems in ClientReportControlBlock_create (see github #134)
+- IEC 61850 client: handle reason code correctly when report contains data with different reason code (see github #133)
 - IEC 61850 server: optimized report buffer handling for buffered reporting (save memory and encoding time)
 - IEC 61850 client: fixed problem - IedConnection cannot be reused after IedConnection_close (github #124)
 - IEC 61850 server: added support for pre configured client with ClientLN
@@ -11,6 +15,7 @@ Changes to version 1.3.3
 - fixed bug in windows socket abstraction
 - fixed client TCP keep alive problem (see github #115)
 - MMS server: read service - return data access error for component access to simple variable
+- GOOSE receiver: fixed potential deadlock when GooseReceiver_stop is called directly after GooseReceiver_start
 
 Changes to version 1.3.2
 ------------------------
diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c
index 3a2e048f0..9c2b2a96e 100644
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@@ -2179,12 +2179,10 @@ removeAllGIReportsFromReportBuffer(ReportBuffer* reportBuffer)
                 reportBuffer->nextToTransmit = currentReport->next;
 
             if (reportBuffer->lastEnqueuedReport == currentReport) {
-                if (lastReport != NULL) {
+                if (lastReport != NULL)
                     reportBuffer->lastEnqueuedReport = lastReport;
-                }
-                else {
+                else
                     reportBuffer->lastEnqueuedReport = reportBuffer->oldestReport;
-                }
             }
         }
         else {