diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-01-07 03:26:59 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-07 03:26:59 -0800 |
| commit | 870edd42f57fb6e67d558222c030592d6a2bc796 (patch) | |
| tree | 2c67c292dff7e5345f33246c6f9391dbd303d57a /src | |
| parent | b527c896586c772b96021faec2d29d21cda27990 (diff) | |
| parent | 063da252c2b96de7b592e2d564fa0d944f71878a (diff) | |
Merge "CMFM: Fix NPE when parent dir is null" into cm-10.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java b/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java index b674d98..6ab3017 100644 --- a/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/DirectoryInlineAutocompleteTextView.java @@ -149,6 +149,9 @@ public class DirectoryInlineAutocompleteTextView //Get the new parent String newParent = FileHelper.getParentDir(new File(value)); + if (newParent == null) { + newParent = FileHelper.ROOT_DIRECTORY; + } if (!newParent.endsWith(File.separator)) { newParent += File.separator; } |