From 9476e6be8fae228cda5867750bc4d102b1f9497d Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 16 Aug 2017 16:52:45 +0500
Subject: - Map correct position to delayed event notification - Fix nested
 condition

---
 src/org/traccar/reports/ReportUtils.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/reports')

diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
index 6a5370d15..8a398e4c2 100644
--- a/src/org/traccar/reports/ReportUtils.java
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -302,12 +302,10 @@ public final class ReportUtils {
                     startEventIndex = -1;
                 }
             }
-            if (startEventIndex != -1) {
-                if (startNoEventIndex != -1 || !trips) {
-                    result.add(calculateTripOrStop(positions, startEventIndex,
+            if (startEventIndex != -1 && (startNoEventIndex != -1 || !trips)) {
+                result.add(calculateTripOrStop(positions, startEventIndex,
                             startNoEventIndex != -1 ? startNoEventIndex : positions.size() - 1,
                             ignoreOdometer, reportClass));
-                }
             }
         }
         return result;
-- 
cgit v1.2.3