From f11b7bd669bbeac8fe1ea87834e8eb6c6a11935f Mon Sep 17 00:00:00 2001
From: Chris Goldthorpe
Date: Wed, 21 Nov 2007 00:28:26 +0000
Subject: Avoid null pointer check when using OpenCheatSheetFromHelpAction.

---
 .../src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'org.eclipse.ui.cheatsheets')

diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java
index f790e7972..2a28355df 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/cheatsheets/OpenCheatSheetAction.java
@@ -116,10 +116,9 @@ public final class OpenCheatSheetAction extends Action {
 	 */
 	public void run() {
 		Shell shell = Display.getDefault().getActiveShell();
-		Object data = shell.getData();
 		// are we in a dialog that can show a cheat sheet?
-		if (!shell.isFocusControl() && data instanceof TrayDialog) {
-			TrayDialog dialog = (TrayDialog)data;
+		if (shell != null && !shell.isFocusControl() && shell.getData() instanceof TrayDialog) {
+			TrayDialog dialog = (TrayDialog)shell.getData();
 			HelpTray tray = (HelpTray)dialog.getTray();
 			if (tray == null) {
 				tray = new HelpTray();
-- 
cgit v1.2.1