summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeith Bade <leith@leithalweapon.geek.nz>2014-11-12 23:17:07 +1100
committerLeith Bade <leith@leithalweapon.geek.nz>2014-11-12 23:17:07 +1100
commit7877d0505e25dd4d2f636b3dba8605a8519c9e9e (patch)
tree03d59948c00f88862d905039d78de6c39fa38965
parent0dd54c037997dd4fabb09f57bf7f85f31b9c67c2 (diff)
downloadqtlocation-mapboxgl-7877d0505e25dd4d2f636b3dba8605a8519c9e9e.tar.gz
Fix crash
-rw-r--r--android/cpp/native_map_view.cpp2
-rw-r--r--include/mbgl/android/native_map_view.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/cpp/native_map_view.cpp b/android/cpp/native_map_view.cpp
index f976d7d966..ab3034a182 100644
--- a/android/cpp/native_map_view.cpp
+++ b/android/cpp/native_map_view.cpp
@@ -80,7 +80,7 @@ void MBGLView::notify_map_change(mbgl::MapChange /* change */, mbgl::timestamp /
nativeView.notifyMapChange();
}
-NativeMapView::NativeMapView(JNIEnv* env, jobject obj_) : map(view), view(*this) {
+NativeMapView::NativeMapView(JNIEnv* env, jobject obj_) : view(*this), map(view) {
LOG_VERBOSE("NativeMapView::NativeMapView");
LOG_ASSERT(env != nullptr);
diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index e2daab9391..dee6a2226e 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -72,8 +72,8 @@ private:
ANativeWindow* window = nullptr;
+ MBGLView view; // Must be before map
mbgl::Map map;
- MBGLView view;
EGLDisplay display = EGL_NO_DISPLAY;
EGLSurface surface = EGL_NO_SURFACE;