From 772f154e4d0c61ec467d5d3658f213081883a32e Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Thu, 4 Dec 2014 01:51:17 +1100
Subject: [PATCH] Fix Android crash

---
 android/cpp/jni.cpp                 | 2 +-
 src/storage/asset_request_baton.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index de3c64c04..20887520c 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -59,7 +59,7 @@ jclass nullPointerExceptionClass = nullptr;
 jmethodID listToArrayId = nullptr;
 
 jclass arrayListClass = nullptr;
-jmethodID arraylistConstructorId = nullptr;
+jmethodID arrayListConstructorId = nullptr;
 jmethodID arrayListAddId = nullptr;
 
 bool throw_error(JNIEnv* env, const char* msg) {
diff --git a/src/storage/asset_request_baton.cpp b/src/storage/asset_request_baton.cpp
index 952eb7c6a..cd4720b37 100644
--- a/src/storage/asset_request_baton.cpp
+++ b/src/storage/asset_request_baton.cpp
@@ -42,10 +42,10 @@ void AssetRequestBaton::cleanup(AssetRequestBaton *ptr) {
         ptr->request->ptr = nullptr;
     }
 
+    ptr->asyncRun.reset();
+
     delete ptr;
     ptr = nullptr;
-
-    ptr->asyncRun.reset();
 }
 
 }