Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0

3 years ago · 257fc30d21
1 changed files with 3 additions and 1 deletions
--- a/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java
@ -166,7 +166,9 @@ public class EventPropertyPane extends UIControlPane implements ListControlPaneP
            }
            eventListWrapperPane.setVisible(listSize > 0);
        }
-        this.selectNameEdList.setSelectedIndex(0);
+        if (this.selectNameEdList != null) {
+            this.selectNameEdList.setSelectedIndex(0);
+        }
        this.repaint();
    }