From 27134df2e40efa14928859bface3de0bc2819072 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 21 Jan 2016 16:51:55 -0800 Subject: [PATCH] [core] Use notModified to check for style change --- src/mbgl/map/map_context.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp index 89c491fac..821741e87 100644 --- a/src/mbgl/map/map_context.cpp +++ b/src/mbgl/map/map_context.cpp @@ -113,12 +113,14 @@ void MapContext::setStyleURL(const std::string& url) { Log::Error(Event::Setup, "loading style failed: %s", res.error->message.c_str()); data.loading = false; } - } else { - // We got a new stylesheet; only update when it's different from the previous one. - if (styleJSON != *res.data) { - loadStyleJSON(*res.data, base); - } + return; } + + if (res.notModified) { + return; + } + + loadStyleJSON(*res.data, base); }); }