Merge remote-tracking branch 'origin/master' into import_export_data

This commit is contained in:
Vitaliy 2020-10-26 02:03:51 +02:00
commit d983d7d518

View file

@ -428,7 +428,7 @@ public class FavouritesDbHelper {
while (fl) {
fl = false;
for (FavouritePoint fp : fdb.getFavouritePoints()) {
if (fp.getName().equals(name) && p.getLatitude() != fp.getLatitude() && p.getLongitude() != fp.getLongitude()) {
if (fp.getName().equals(name) && p.getLatitude() != fp.getLatitude() && p.getLongitude() != fp.getLongitude() && fp.getCategory().equals(p.getCategory())) {
number++;
index = " (" + number + ")";
name = p.getName() + index;