summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Gheorghe <gheorghe@ca.ibm.com>2012-08-02 14:28:30 -0400
committerBogdan Gheorghe <gheorghe@ca.ibm.com>2012-08-08 12:11:26 -0400
commite5048f56d6534a718cd3f93bfd8fdd52aca34dcd (patch)
tree48c2662c27bc85adac29011bd3b3efdd3049918b
parentfeeb829364550341b4ae470013292e77198660ff (diff)
downloadeclipse.platform.swt-e5048f56d6534a718cd3f93bfd8fdd52aca34dcd.tar.gz
eclipse.platform.swt-e5048f56d6534a718cd3f93bfd8fdd52aca34dcd.tar.xz
eclipse.platform.swt-e5048f56d6534a718cd3f93bfd8fdd52aca34dcd.zip
Bug 386260 - NPE in org.eclipse.swt.program.Program.gnome_getProgram
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
index fbc3c7f72a..b2e1a21efa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
@@ -565,7 +565,8 @@ static Program gnome_getProgram(Display display, String mimeType) {
if (icon_name != 0) OS.g_free(icon_name);
GNOME.gnome_vfs_mime_application_free(ptr);
}
- return program.command != null ? program : null;
+
+ return program != null && program.command != null ? program : null;
}
static boolean gnome_init() {