diff options
| author | rsudev <rasch@munin-soft.de> | 2014-06-19 00:40:51 +0200 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2014-06-19 00:40:51 +0200 |
| commit | 967dc277bbac2c43e2d7162b8853aea65d66bb69 (patch) | |
| tree | c250725ef35d87131c112f4bcca8a14209ee376d /main | |
| parent | 764a9c50cd8b006c4ab8ab7b29a99e4023fb5e61 (diff) | |
| parent | e901854869c4642b6e7d5eb1d3ef3313836d40ab (diff) | |
| download | cgeo-967dc277bbac2c43e2d7162b8853aea65d66bb69.zip cgeo-967dc277bbac2c43e2d7162b8853aea65d66bb69.tar.gz cgeo-967dc277bbac2c43e2d7162b8853aea65d66bb69.tar.bz2 | |
Merge branch 'release'
Conflicts:
main/src/cgeo/geocaching/CacheListActivity.java
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheListActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index 9e58edc..598171f 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -1065,6 +1065,13 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA } }, true, StoredList.TEMPORARY_LIST_ID, newListName); } else { + if (type != CacheListType.OFFLINE) { + for (final Geocache geocache : caches) { + if (geocache.getListId() == StoredList.TEMPORARY_LIST_ID) { + geocache.setListId(StoredList.STANDARD_LIST_ID); + } + } + } refreshStoredInternal(caches); } } |