mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
Removed an NPE when cancel was selected from browse dialog on path or file options
This commit is contained in:
parent
51a8ec8e42
commit
3a76c4f68c
1 changed files with 14 additions and 14 deletions
|
@ -492,10 +492,10 @@ public class FileListControl {
|
||||||
SelectPathInputDialog dialog = new SelectPathInputDialog(getListControl().getShell(), title, message, initVal, null, browseType);
|
SelectPathInputDialog dialog = new SelectPathInputDialog(getListControl().getShell(), title, message, initVal, null, browseType);
|
||||||
if (dialog.open() == SelectPathInputDialog.OK) {
|
if (dialog.open() == SelectPathInputDialog.OK) {
|
||||||
input = dialog.getValue();
|
input = dialog.getValue();
|
||||||
if (input == null || input.length() == 0) return ""; //$NON-NLS-1$
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Double-quote the spaces in paths (if any)
|
// Double-quote the spaces in paths (if any)
|
||||||
|
if (input != null && input.length() > 0) {
|
||||||
switch (browseType) {
|
switch (browseType) {
|
||||||
case IOption.BROWSE_DIR:
|
case IOption.BROWSE_DIR:
|
||||||
case IOption.BROWSE_FILE:
|
case IOption.BROWSE_FILE:
|
||||||
|
@ -508,8 +508,8 @@ public class FileListControl {
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return input;
|
return input;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue