From 3ee9d12013afd7f513f6a2f41c98684e824e5a60 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 21 Apr 2016 17:33:07 +0300
Subject: [PATCH] [Qt] Remove duplicated mbgl::Map initialization

---
 platform/qt/src/qmapboxgl.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index df0e89a53..e490f75f1 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -105,12 +105,6 @@ QMapboxGL::QMapboxGL(QObject *parent_, const QMapboxGLSettings &settings)
     : QObject(parent_)
     , d_ptr(new QMapboxGLPrivate(this, settings))
 {
-    mbgl::MapMode mapMode = static_cast<mbgl::MapMode>(settings.mapMode());
-    mbgl::GLContextMode contextMode = static_cast<mbgl::GLContextMode>(settings.contextMode());
-    mbgl::ConstrainMode constrainMode = static_cast<mbgl::ConstrainMode>(settings.constrainMode());
-
-    d_ptr->fileSourceObj->setAccessToken(settings.accessToken().toStdString());
-    d_ptr->mapObj = std::make_unique<mbgl::Map>(*d_ptr, *d_ptr->fileSourceObj, mapMode, contextMode, constrainMode);
 }
 
 QMapboxGL::~QMapboxGL()
@@ -585,9 +579,11 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin
         settings.cacheDatabaseMaximumSize()))
     , mapObj(std::make_unique<mbgl::Map>(
         *this, *fileSourceObj,
-        mbgl::MapMode::Continuous,
-        mbgl::GLContextMode::Shared))
+        static_cast<mbgl::MapMode>(settings.mapMode()),
+        static_cast<mbgl::GLContextMode>(settings.contextMode()),
+        static_cast<mbgl::ConstrainMode>(settings.constrainMode())))
 {
+    fileSourceObj->setAccessToken(settings.accessToken().toStdString());
     connect(this, SIGNAL(needsRendering()), q_ptr, SIGNAL(needsRendering()));
     connect(this, SIGNAL(mapRegionDidChange()), q_ptr, SIGNAL(mapRegionDidChange()));
 }