| commit | f23388fdcee925e24869762916a31cdbdbbc0757 | [log] [tgz] |
|---|---|---|
| author | David Ostrovsky <david@ostrovsky.org> | Sat Feb 03 00:08:10 2018 +0100 |
| committer | David Ostrovsky <david@ostrovsky.org> | Sat Feb 03 00:16:10 2018 +0100 |
| tree | 28c7b3b1a3394dc0301738eb0b52bcfabb332fea | |
| parent | 522a7b5d1ba437bc43987e354b5b7d993f3bee2c [diff] |
EditPreferencesBox: Don't try to close panel on setting screen EditPreferencesBox is shown on two different locations, in inline editor and in setting screen. Only in inline editor the popup panel can be closed. On setting screen it is not a popup panel but a part of the screen and cannot be closed. This fixes the ClassCastException, thrown when trying to cast the screen to the PopupPanel. Bug: Issue 8250 Change-Id: Ia693a664d69cc553502343af4e50a455b319fe42
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java index 6ef71e6..5157123 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java
@@ -282,7 +282,9 @@ Gerrit.setEditPreferences(p.copyTo(new EditPreferencesInfo())); } }); - close(); + if (view != null) { + close(); + } } @UiHandler("close")