Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-03-02 13:18:23 +01:00
commit ca15e61132
2 changed files with 3 additions and 2 deletions

View file

@ -210,7 +210,8 @@ public class GPXDatabase {
}
private String getFileDir(File itemFile) {
return itemFile.getParentFile().equals(context.getAppPath(IndexConstants.GPX_INDEX_DIR)) ?
return itemFile.getParentFile() == null ||
itemFile.getParentFile().equals(context.getAppPath(IndexConstants.GPX_INDEX_DIR)) ?
"" : itemFile.getParentFile().getName();
}