fix #3980: re-initialize sort order after switch to history

1 files changed, 9 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index c681d00..333dfb7 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -1038,11 +1038,13 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
         registerForContextMenu(list);
         adapter = new CacheListAdapter(this, cacheList, type);
 
-        listFooter = getLayoutInflater().inflate(R.layout.cacheslist_footer, null);
-        listFooter.setClickable(true);
-        listFooter.setOnClickListener(new MoreCachesListener());
-        listFooterText = (TextView) listFooter.findViewById(R.id.more_caches);
-        list.addFooterView(listFooter);
+        if (listFooter == null) {
+            listFooter = getLayoutInflater().inflate(R.layout.cacheslist_footer, null);
+            listFooter.setClickable(true);
+            listFooter.setOnClickListener(new MoreCachesListener());
+            listFooterText = (TextView) listFooter.findViewById(R.id.more_caches);
+            list.addFooterView(listFooter);
+        }
         setListAdapter(adapter);
         adapter.forceSort();
     }
@@ -1441,6 +1443,8 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
 
         Settings.saveLastList(listId);
 
+        initAdapter();
+
         showProgress(true);
         showFooterLoadingCaches();
         DataStore.moveToList(adapter.getCheckedCaches(), listId);