Backport of fix for #7183

svn changeset:20411/svn branch:6.6

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 3200b197deeb15ffe6e25a40898ee6749756966e..992c8fbdd41de5f6e3596cc015e594d763685de8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -4423,7 +4423,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                                                     .contains(getKey());
 
                                     if (!currentlyJustThisRowSelected) {
-                                        if (multiselectmode == MULTISELECT_MODE_DEFAULT) {
+                                        if (selectMode == SELECT_MODE_SINGLE
+                                                || (selectMode == SELECT_MODE_MULTI && multiselectmode == MULTISELECT_MODE_DEFAULT)) {
                                             deselectAll();
                                         }
                                         toggleSelection();