From 2a59940ea1e9ac5dc1b7c8d3753bcbfe0e0b797e Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Thu, 15 Jan 2015 18:16:00 +0100
Subject: fix #4617: NPE in some cases when trackable cannot be found

---
 main/src/cgeo/geocaching/TrackableActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index c6d5bed..139b136 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -99,6 +99,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.viewpager_activity);
+        createSubscriptions = new CompositeSubscription();
 
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.trackable));
@@ -191,7 +192,6 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
             }
         });
         waitDialog = ProgressDialog.show(this, message, res.getString(R.string.trackable_details_loading), true, true);
-        createSubscriptions = new CompositeSubscription();
         createSubscriptions.add(AppObservable.bindActivity(this, loadTrackable(geocode, guid, id)).singleOrDefault(null).subscribe(new Action1<Trackable>() {
             @Override
             public void call(final Trackable trackable) {
-- 
cgit v1.1