From 143df6b3ee60a62504635e7a63596a1914066087 Mon Sep 17 00:00:00 2001
From: Kai Boernert <kai.boernert@oio.de>
Date: Thu, 3 Aug 2017 14:01:15 +0200
Subject: [PATCH 1/2] do not always call updateSettings on newData, as this
 disturbes the sorting due to recreation of columns/rows

---
 .../sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
index 0e8d5564368..c2a7030dac3 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
@@ -2241,12 +2241,13 @@ public abstract class LeaderboardPanel<LS extends LeaderboardSettings> extends A
                     new AsyncCallback<LeaderboardDTO>() {
                         @Override
                         public void onSuccess(LeaderboardDTO result) {
-                            currentSettings = overrideDefaultsForNamesOfRaceColumns(currentSettings,result);
-                            
+                            LeaderboardSettings potentialChangeSettings = overrideDefaultsForNamesOfRaceColumns(currentSettings,result);
                             try {
                                 updateLeaderboard(result);
                                 // reapply, as columns might have changed
-                                updateSettings(currentSettings);
+                                if(!potentialChangeSettings.equals(currentSettings)){
+                                    updateSettings(potentialChangeSettings);
+                                }
                             } finally {
                                 if (showProgress) {
                                     removeBusyTask();

From e7c5cf54817a63a38de748669e05aec8f5ddcfb9 Mon Sep 17 00:00:00 2001
From: Kai Boernert <kai.boernert@oio.de>
Date: Thu, 3 Aug 2017 14:03:42 +0200
Subject: [PATCH 2/2] Revert "do not always call updateSettings on newData, as
 this disturbes the sorting due to recreation of columns/rows"

This reverts commit 143df6b3ee60a62504635e7a63596a1914066087.
---
 .../sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
index c2a7030dac3..0e8d5564368 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
@@ -2241,13 +2241,12 @@ public abstract class LeaderboardPanel<LS extends LeaderboardSettings> extends A
                     new AsyncCallback<LeaderboardDTO>() {
                         @Override
                         public void onSuccess(LeaderboardDTO result) {
-                            LeaderboardSettings potentialChangeSettings = overrideDefaultsForNamesOfRaceColumns(currentSettings,result);
+                            currentSettings = overrideDefaultsForNamesOfRaceColumns(currentSettings,result);
+                            
                             try {
                                 updateLeaderboard(result);
                                 // reapply, as columns might have changed
-                                if(!potentialChangeSettings.equals(currentSettings)){
-                                    updateSettings(potentialChangeSettings);
-                                }
+                                updateSettings(currentSettings);
                             } finally {
                                 if (showProgress) {
                                     removeBusyTask();