From 7877d0505e25dd4d2f636b3dba8605a8519c9e9e Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Wed, 12 Nov 2014 23:17:07 +1100 Subject: Fix crash --- android/cpp/native_map_view.cpp | 2 +- include/mbgl/android/native_map_view.hpp | 2 +- 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; -- cgit v1.2.1