Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Hufmann2014-09-04 18:36:50 +0000
committerBernd Hufmann2014-09-05 12:29:43 +0000
commit50e14d9f6f2171ef529ccbe1ff0b4931987f303b (patch)
treeb9079d82f9002acf2524427b0a21b6c36a85c25f
parent5425160475a40081c232fb418f39c2f5a7942253 (diff)
downloadorg.eclipse.linuxtools-50e14d9f6f2171ef529ccbe1ff0b4931987f303b.tar.gz
org.eclipse.linuxtools-50e14d9f6f2171ef529ccbe1ff0b4931987f303b.tar.xz
org.eclipse.linuxtools-50e14d9f6f2171ef529ccbe1ff0b4931987f303b.zip
lttng-control: fix null string in OpenCommandScriptDialog
Change-Id: Ifb668b85bfc99e68e93018827191bf303b12e222 Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com> Reviewed-on: https://git.eclipse.org/r/32877 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Reviewed-on: https://git.eclipse.org/r/32915
-rw-r--r--lttng/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/OpenCommandScriptDialog.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/OpenCommandScriptDialog.java b/lttng/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/OpenCommandScriptDialog.java
index b6ee2f11c1..7c1f422577 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/OpenCommandScriptDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.ui/src/org/eclipse/linuxtools/internal/lttng2/control/ui/views/dialogs/OpenCommandScriptDialog.java
@@ -232,7 +232,9 @@ public class OpenCommandScriptDialog extends Dialog implements ISelectCommandScr
dialog.setFilterExtensions(new String[] { "*.*", "*.*" }); //$NON-NLS-1$ //$NON-NLS-2$
dialog.setText(Messages.TraceControl_ExecuteScriptDialogTitle);
String selectedFileName = dialog.open();
- fFileNameCombo.setText(selectedFileName);
+ if (selectedFileName != null) {
+ fFileNameCombo.setText(selectedFileName);
+ }
}
@Override

Back to the top