aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Attebrant2013-03-07 07:32:30 (EST)
committerPaul Webster2013-03-07 07:32:30 (EST)
commitec77102203186c7cf66d7af96013bb0a925840ee (patch)
tree13aac1f5347763b8e3e970de33ceeffeb4d899f8
parent8fab17122c0d0e9d0181ef533f0f5d4b56d31092 (diff)
downloadeclipse.platform.ui-ec77102203186c7cf66d7af96013bb0a925840ee.zip
eclipse.platform.ui-ec77102203186c7cf66d7af96013bb0a925840ee.tar.gz
eclipse.platform.ui-ec77102203186c7cf66d7af96013bb0a925840ee.tar.bz2
Bug 311692 - [TabbedProperties] Properties View crashes when reopening with NPE if using Tabbed Properties
-rw-r--r--examples/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague/src/org/eclipse/ui/examples/views/properties/tabbed/hockeyleague/ui/editor/HockeyleagueEditor.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague/src/org/eclipse/ui/examples/views/properties/tabbed/hockeyleague/ui/editor/HockeyleagueEditor.java b/examples/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague/src/org/eclipse/ui/examples/views/properties/tabbed/hockeyleague/ui/editor/HockeyleagueEditor.java
index e28534f..ad17b73 100644
--- a/examples/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague/src/org/eclipse/ui/examples/views/properties/tabbed/hockeyleague/ui/editor/HockeyleagueEditor.java
+++ b/examples/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague/src/org/eclipse/ui/examples/views/properties/tabbed/hockeyleague/ui/editor/HockeyleagueEditor.java
@@ -1323,7 +1323,8 @@ public class HockeyleagueEditor
* @generated NOT
*/
public TabbedPropertySheetPage getPropertySheetPage() {
- if (propertySheetPage == null || propertySheetPage.getControl() == null) {
+ if (propertySheetPage == null || propertySheetPage.getControl() == null
+ || propertySheetPage.getControl().isDisposed()) {
propertySheetPage = new HockeyleaguePropertySheetPage(this);
}