diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-04-06 14:47:53 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-04-06 14:47:53 +0200 |
| commit | 6d6ada1924129ee0b97a6dab7427f134faca0178 (patch) | |
| tree | fec5189fb750613d506d2e6d357393bef4604525 | |
| parent | 10110e6b83850b449ae559d06220e1d1faab3745 (diff) | |
| parent | c890bfe512653280ca23dae53281137a5db9ad54 (diff) | |
| download | cgeo-6d6ada1924129ee0b97a6dab7427f134faca0178.zip cgeo-6d6ada1924129ee0b97a6dab7427f134faca0178.tar.gz cgeo-6d6ada1924129ee0b97a6dab7427f134faca0178.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings_not_translatable.xml
| -rw-r--r-- | main/src/cgeo/geocaching/cgeocaches.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index 096f960..61a32f1 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -465,7 +465,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - if (currentLoader.isLoading()) { + if (currentLoader != null && currentLoader.isLoading()) { showFooterLoadingCaches(); } } |