diff options
| author | Roman Flueckiger | 2017-01-27 10:46:36 +0000 |
|---|---|---|
| committer | Roman Flueckiger | 2017-01-27 12:52:21 +0000 |
| commit | 4a084e9068e076925dfb412ad6af2369e6f9781d (patch) | |
| tree | 20961224f218dd1315a28883d7c20075ae5a4bbf | |
| parent | 3219cc59927c69b39a95c648129976955271aeae (diff) | |
| download | org.eclipse.nebula.widgets.nattable-4a084e9068e076925dfb412ad6af2369e6f9781d.tar.gz org.eclipse.nebula.widgets.nattable-4a084e9068e076925dfb412ad6af2369e6f9781d.tar.xz org.eclipse.nebula.widgets.nattable-4a084e9068e076925dfb412ad6af2369e6f9781d.zip | |
Bug 511171 - Widget disposed when closing NatTable with an open filter
combo
Change-Id: I67df6a17b762f7f22b5782ad0c8c90554d7617ec
Signed-off-by: Roman Flueckiger <rflueckiger@inventage.com>
| -rw-r--r-- | org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java index 8a7f02ed..81cf67d9 100644 --- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java +++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2016 Original authors and others. + * Copyright (c) 2012, 2017 Original authors and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -499,8 +499,8 @@ public abstract class AbstractCellEditor implements ICellEditor { @Override public void focusLost(FocusEvent e) { if (this.handleFocusChanges) { - if (!commit(MoveDirectionEnum.NONE, true)) { - if (e.widget instanceof Control && !e.widget.isDisposed()) { + if (!e.widget.isDisposed() && !commit(MoveDirectionEnum.NONE, true)) { + if (e.widget instanceof Control) { ((Control) e.widget).forceFocus(); } } else { |