From 4421b0ef859e2f786ddb4b11077f6576b71f5879 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Mon, 16 Sep 2013 10:04:19 -0500 Subject: [PATCH] Added more protection around getDesktop calls. First test Desktop.isDesktopSupported() and fail fast. --- core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java | 2 +- .../openrocket/gui/dialogs/preferences/PreferencesDialog.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java b/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java index 59ee62ce7..8a2214410 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java @@ -47,7 +47,7 @@ public class EditDecalDialog extends JDialog { ButtonGroup execGroup = new ButtonGroup(); - if (Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) { systemRadio = new JRadioButton(trans.get("EditDecalDialog.lbl.system")); systemRadio.setSelected(true); diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java index 2318e3bd1..12d4daba9 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java @@ -490,7 +490,7 @@ public class PreferencesDialog extends JDialog { panel.add(showPrompt, "wrap"); execGroup.add(showPrompt); - if (Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) { JRadioButton systemRadio = new JRadioButton(trans.get("EditDecalDialog.lbl.system")); systemRadio.setSelected(preferences.isDecalEditorPreferenceSystem());