Ensure no GL commands are executed after pause

2 files changed, 4 insertions, 5 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 0464ed3f1e..3c1dcdd148 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -20,15 +20,12 @@ Map::~Map() {
     resume();
 }
 
-void Map::pause(bool waitForPause) {
+void Map::pause() {
     assert(data->mode == MapMode::Continuous);
 
     std::unique_lock<std::mutex> lockPause(data->mutexPause);
     context->invoke(&MapContext::pause);
-
-    if (waitForPause) {
-        data->condPaused.wait(lockPause);
-    }
+    data->condPaused.wait(lockPause);
 }
 
 void Map::resume() {
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index e72a174801..f655c9b0b2 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -77,6 +77,8 @@ MapContext::~MapContext() {
 }
 
 void MapContext::pause() {
+    MBGL_CHECK_ERROR(glFinish());
+
     view.deactivate();
 
     std::unique_lock<std::mutex> lockPause(data.mutexPause);