From d9dcba250607f6f766625b9f8511b038f8de4382 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 8 Mar 2012 16:49:21 +0100
Subject: [PATCH] don't implicitly add COMBINED wind track if wind sources are
 explicitly specified

---
 .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index 83f6672add4..2a8729bcb58 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -546,12 +546,12 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
             result.windTrackInfoByWindSource = windTrackInfoDTOs;
             if (from != null && to != null) {
                 List<WindSource> windSourcesToDeliver = new ArrayList<WindSource>();
-                if (windSources == null) {
+                if (windSources != null) {
                     windSourcesToDeliver.addAll(Arrays.asList(windSources));
                 } else {
                     Util.addAll(trackedRace.getWindSources(), windSourcesToDeliver);
+                    windSourcesToDeliver.add(new WindSourceImpl(WindSourceType.COMBINED));
                 }
-                windSourcesToDeliver.add(new WindSourceImpl(WindSourceType.COMBINED));
                 for (WindSource windSource : windSourcesToDeliver) {
                     WindTrackInfoDTO windTrackInfoDTO = new WindTrackInfoDTO();
                     windTrackInfoDTO.windFixes = new ArrayList<WindDTO>();