Merge branch 'release'

Conflicts:
	main/src/cgeo/geocaching/CacheListActivity.java

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);
         }
     }